diff --git a/assets/bundles/battleHero/prefab/weapon/宝石掉落.prefab b/assets/bundles/battleHero/prefab/weapon/宝石掉落.prefab new file mode 100644 index 0000000..15dcb6c --- /dev/null +++ b/assets/bundles/battleHero/prefab/weapon/宝石掉落.prefab @@ -0,0 +1,999 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "宝石掉落", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "宝石掉落", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + }, + { + "__id__": 38 + } + ], + "_active": true, + "_components": [ + { + "__id__": 46 + } + ], + "_prefab": { + "__id__": 48 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "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.Node", + "_name": "品质", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 3 + }, + { + "__id__": 11 + }, + { + "__id__": 19 + }, + { + "__id__": 27 + } + ], + "_active": true, + "_components": [ + { + "__id__": 35 + } + ], + "_prefab": { + "__id__": 37 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "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.Node", + "_name": "1", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 4 + }, + { + "__id__": 6 + }, + { + "__id__": 8 + } + ], + "_prefab": { + "__id__": 10 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "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__": 3 + }, + "_enabled": true, + "__prefab": { + "__id__": 5 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 205.99000549316406, + "height": 205.3800048828125 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5165784786856596, + "y": 0.2529944388409205 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "4cQNW01oxEl7VBDaMLPvMd" + }, + { + "__type__": "sp.Skeleton", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 3 + }, + "_enabled": true, + "__prefab": { + "__id__": 7 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_skeletonData": { + "__uuid__": "0e4e8a50-2cf0-4df2-a2ac-ffc21bb9c0aa", + "__expectedType__": "sp.SkeletonData" + }, + "defaultSkin": "default", + "defaultAnimation": "animation", + "_premultipliedAlpha": true, + "_timeScale": 1, + "_preCacheMode": 0, + "_cacheMode": 0, + "_sockets": [], + "_useTint": false, + "_debugMesh": false, + "_debugBones": false, + "_debugSlots": false, + "_enableBatch": false, + "loop": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6386ekq2xJsaSiK7uoqGGS" + }, + { + "__type__": "cc.Sorting2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 3 + }, + "_enabled": true, + "__prefab": { + "__id__": 9 + }, + "_sortingLayer": 4, + "_sortingOrder": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "372YwBi2tGoonfGr8/b7ki" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "6eL1AwEhJAgZq7BVplb2Ys", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 12 + }, + { + "__id__": 14 + }, + { + "__id__": 16 + } + ], + "_prefab": { + "__id__": 18 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "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__": 11 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 205.99000549316406, + "height": 205.3800048828125 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5165784786856596, + "y": 0.2529944388409205 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "75tVGbu49CQ49RjzHmHsPp" + }, + { + "__type__": "sp.Skeleton", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 11 + }, + "_enabled": true, + "__prefab": { + "__id__": 15 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_skeletonData": { + "__uuid__": "6d3fd8fe-76cc-4020-93b5-37392f9cf374", + "__expectedType__": "sp.SkeletonData" + }, + "defaultSkin": "default", + "defaultAnimation": "animation", + "_premultipliedAlpha": true, + "_timeScale": 1, + "_preCacheMode": 0, + "_cacheMode": 0, + "_sockets": [], + "_useTint": false, + "_debugMesh": false, + "_debugBones": false, + "_debugSlots": false, + "_enableBatch": false, + "loop": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "cbRup5gOxIw6Jxb0oGp03k" + }, + { + "__type__": "cc.Sorting2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 11 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "_sortingLayer": 4, + "_sortingOrder": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "30zOpFQg5L44vNQkzdf+6E" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "21H2SvrHNDt7Tm0yf8Qb4o", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "3", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 20 + }, + { + "__id__": 22 + }, + { + "__id__": 24 + } + ], + "_prefab": { + "__id__": 26 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "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__": 19 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 205.99000549316406, + "height": 205.3800048828125 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5165784786856596, + "y": 0.2529944388409205 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a4JIecQrZIbp+2aS7XsOKh" + }, + { + "__type__": "sp.Skeleton", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 19 + }, + "_enabled": true, + "__prefab": { + "__id__": 23 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_skeletonData": { + "__uuid__": "91562814-0679-419f-a43f-9f607ec7d25b", + "__expectedType__": "sp.SkeletonData" + }, + "defaultSkin": "default", + "defaultAnimation": "animation", + "_premultipliedAlpha": true, + "_timeScale": 1, + "_preCacheMode": 0, + "_cacheMode": 0, + "_sockets": [], + "_useTint": false, + "_debugMesh": false, + "_debugBones": false, + "_debugSlots": false, + "_enableBatch": false, + "loop": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "cdcTh1Ay1F4oYSo2Yjv3ga" + }, + { + "__type__": "cc.Sorting2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 19 + }, + "_enabled": true, + "__prefab": { + "__id__": 25 + }, + "_sortingLayer": 4, + "_sortingOrder": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e3r+QFyixFJo1lFcAV+Bsk" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c32pOjfa1D3pk/n2V+i5IJ", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "4", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 28 + }, + { + "__id__": 30 + }, + { + "__id__": 32 + } + ], + "_prefab": { + "__id__": 34 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "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__": 27 + }, + "_enabled": true, + "__prefab": { + "__id__": 29 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 205.99000549316406, + "height": 205.3800048828125 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5165784786856596, + "y": 0.2529944388409205 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "baTO/VjhVL566hukJgNNPJ" + }, + { + "__type__": "sp.Skeleton", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 27 + }, + "_enabled": true, + "__prefab": { + "__id__": 31 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_skeletonData": { + "__uuid__": "a5c692b3-1b31-4447-a831-b0791c57cd67", + "__expectedType__": "sp.SkeletonData" + }, + "defaultSkin": "default", + "defaultAnimation": "animation", + "_premultipliedAlpha": true, + "_timeScale": 1, + "_preCacheMode": 0, + "_cacheMode": 0, + "_sockets": [], + "_useTint": false, + "_debugMesh": false, + "_debugBones": false, + "_debugSlots": false, + "_enableBatch": false, + "loop": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ac/tcpmw5KW7EQpmiP9LoA" + }, + { + "__type__": "cc.Sorting2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 27 + }, + "_enabled": true, + "__prefab": { + "__id__": 33 + }, + "_sortingLayer": 4, + "_sortingOrder": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3cbOZOxhFFxJ/m1jbPCyDQ" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "a1GiwOiK5FG4Zy8QLi90Rk", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 36 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "51aYkcKqtFqqLWfGTGAVrA" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "feBQ1Fb/VKdqxlhrlvxLNU", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "图标", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 39 + }, + { + "__id__": 41 + }, + { + "__id__": 43 + } + ], + "_prefab": { + "__id__": 45 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 23.745, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.5, + "y": 0.5, + "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__": 38 + }, + "_enabled": true, + "__prefab": { + "__id__": 40 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 165, + "height": 159 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "09IzHW8o9K0LQMAZ/edIB8" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 38 + }, + "_enabled": true, + "__prefab": { + "__id__": 42 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": null, + "_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": "17YNYp38JIDbcBKZdL+INm" + }, + { + "__type__": "cc.Sorting2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 38 + }, + "_enabled": true, + "__prefab": { + "__id__": 44 + }, + "_sortingLayer": 4, + "_sortingOrder": 1, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "4ferLef7FMOavOKF/ykI3P" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "9fjS22XpRD9o7fJQ+8T6x6", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 47 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 101, + "height": 101 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f6YsXk1i1GEqotUf4LB/Hr" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "5a0/NSwSVAuoRgwC2NTV6O", + "instance": null, + "targetOverrides": null + } +] \ No newline at end of file diff --git a/assets/bundles/battleHero/prefab/weapon/宝石掉落.prefab.meta b/assets/bundles/battleHero/prefab/weapon/宝石掉落.prefab.meta new file mode 100644 index 0000000..3ec09af --- /dev/null +++ b/assets/bundles/battleHero/prefab/weapon/宝石掉落.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "39342209-ef6d-4d81-912f-9fd20261820a", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "宝石掉落" + } +} diff --git a/assets/bundles/comm/prefab/gemGrid.prefab b/assets/bundles/comm/prefab/gemGrid.prefab index a2645df..cfe9ecc 100644 --- a/assets/bundles/comm/prefab/gemGrid.prefab +++ b/assets/bundles/comm/prefab/gemGrid.prefab @@ -26,19 +26,22 @@ }, { "__id__": 14 + }, + { + "__id__": 20 } ], "_active": true, "_components": [ { - "__id__": 20 + "__id__": 26 }, { - "__id__": 22 + "__id__": 28 } ], "_prefab": { - "__id__": 24 + "__id__": 30 }, "_lpos": { "__type__": "cc.Vec3", @@ -169,7 +172,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "f5d302cf-5226-418f-b568-c3681d7106e4@f9941", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 0, "_fillType": 0, "_sizeMode": 1, @@ -266,8 +272,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 165, - "height": 159 + "width": 135, + "height": 114 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -302,7 +308,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "82b85f84-f904-4852-a703-dd6d2e51de6c@f9941", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 0, "_fillType": 0, "_sizeMode": 1, @@ -494,6 +503,165 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "lbName", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 21 + }, + { + "__id__": 23 + } + ], + "_prefab": { + "__id__": 25 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -49.986, + "y": 47.017, + "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__": 20 + }, + "_enabled": true, + "__prefab": { + "__id__": 22 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 104.0107421875, + "height": 54.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5dAkhHMiFInpGUmzUs2OKp" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 20 + }, + "_enabled": true, + "__prefab": { + "__id__": 24 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "攻击宝石2级", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 18, + "_fontSize": 18, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ad8UCJDLVBcreR2uCN4955" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c4X5/9y0FDJqwFuflm+HrK", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -504,7 +672,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 27 }, "_contentSize": { "__type__": "cc.Size", @@ -532,7 +700,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 23 + "__id__": 29 }, "_id": "" }, diff --git a/assets/bundles/gemstone/prefab/PanelGemstone.prefab b/assets/bundles/gemstone/prefab/PanelGemstone.prefab index 5c2b83d..8e3f80e 100644 --- a/assets/bundles/gemstone/prefab/PanelGemstone.prefab +++ b/assets/bundles/gemstone/prefab/PanelGemstone.prefab @@ -28,17 +28,17 @@ "_active": true, "_components": [ { - "__id__": 276 + "__id__": 274 }, { - "__id__": 278 + "__id__": 276 }, { - "__id__": 280 + "__id__": 278 } ], "_prefab": { - "__id__": 282 + "__id__": 280 }, "_lpos": { "__type__": "cc.Vec3", @@ -300,38 +300,23 @@ "__id__": 21 }, { - "__id__": 27 - }, - { - "__id__": 113 - }, - { - "__id__": 119 + "__id__": 107 }, { - "__id__": 125 - }, - { - "__id__": 145 - }, - { - "__id__": 159 - }, - { - "__id__": 261 + "__id__": 249 } ], "_active": true, "_components": [ { - "__id__": 271 + "__id__": 269 }, { - "__id__": 273 + "__id__": 271 } ], "_prefab": { - "__id__": 275 + "__id__": 273 }, "_lpos": { "__type__": "cc.Vec3", @@ -500,29 +485,98 @@ }, { "__type__": "cc.Node", - "_name": "biaoti", + "_name": "top", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 14 }, + "_children": [ + { + "__id__": 22 + }, + { + "__id__": 28 + }, + { + "__id__": 34 + }, + { + "__id__": 40 + }, + { + "__id__": 74 + }, + { + "__id__": 88 + } + ], + "_active": true, + "_components": [ + { + "__id__": 102 + }, + { + "__id__": 104 + } + ], + "_prefab": { + "__id__": 106 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 316.76199999999994, + "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.Node", + "_name": "上方框体", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 21 + }, "_children": [], "_active": true, "_components": [ { - "__id__": 22 + "__id__": 23 }, { - "__id__": 24 + "__id__": 25 } ], "_prefab": { - "__id__": 26 + "__id__": 27 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 643.228, + "y": 0, "z": 0 }, "_lrot": { @@ -554,16 +608,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 21 + "__id__": 22 }, "_enabled": true, "__prefab": { - "__id__": 23 + "__id__": 24 }, "_contentSize": { "__type__": "cc.Size", - "width": 251, - "height": 63 + "width": 750, + "height": 676 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -574,7 +628,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c2c9+WMaVJxKet4f/+f4lh" + "fileId": "57EQ5SfDhIGb4FyDd6kX38" }, { "__type__": "cc.Sprite", @@ -582,11 +636,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 21 + "__id__": 22 }, "_enabled": true, "__prefab": { - "__id__": 25 + "__id__": 26 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -599,7 +653,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "ea7df53f-2208-42c1-add1-367835c60386@f9941", + "__uuid__": "50d46675-c6e3-4e1e-b225-8fbae99f83cb@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -619,7 +673,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "591X2i+qRHIregoDe5M3Hr" + "fileId": "b6mZJGJBJASr3yKJb1pj13" }, { "__type__": "cc.PrefabInfo", @@ -629,156 +683,36 @@ "asset": { "__id__": 0 }, - "fileId": "9ewxgBMKZCIpQlhX2Uk3cd", + "fileId": "918KW48nRBaZ9l5dXg/afS", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "ui_list", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 14 - }, - "_children": [ - { - "__id__": 28 - } - ], - "_active": true, - "_components": [ - { - "__id__": 108 - }, - { - "__id__": 110 - } - ], - "_prefab": { - "__id__": 112 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 591.223, - "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.Node", - "_name": "itemTemplate", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 27 - }, - "_children": [ - { - "__id__": 29 - }, - { - "__id__": 35 - }, - { - "__id__": 41 - }, - { - "__id__": 57 - }, - { - "__id__": 73 - }, - { - "__id__": 89 - } - ], - "_active": true, - "_components": [ - { - "__id__": 105 - } - ], - "_prefab": { - "__id__": 107 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -235, - "y": -110, - "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.Node", - "_name": "bg", + "_name": "sp_title", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 28 + "__id__": 21 }, "_children": [], "_active": true, "_components": [ { - "__id__": 30 + "__id__": 29 }, { - "__id__": 32 + "__id__": 31 } ], "_prefab": { - "__id__": 34 + "__id__": 33 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 136.78500000000008, "z": 0 }, "_lrot": { @@ -810,16 +744,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 29 + "__id__": 28 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 30 }, "_contentSize": { "__type__": "cc.Size", - "width": 181, - "height": 182 + "width": 721, + "height": 310 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -830,7 +764,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e9Eap+CCRA9LWWrnpS/OP7" + "fileId": "19LT7pxetLx57uR9hB3o08" }, { "__type__": "cc.Sprite", @@ -838,11 +772,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 29 + "__id__": 28 }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 32 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -854,10 +788,7 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "8e6d98fd-1921-4098-8c1b-7d6df0b35b3e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, + "_spriteFrame": null, "_type": 0, "_fillType": 0, "_sizeMode": 1, @@ -875,7 +806,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c0ED52sTxAKrPTVwZBNHEF" + "fileId": "a1Vff6SSFMqpj/sIlkYPwx" }, { "__type__": "cc.PrefabInfo", @@ -885,36 +816,36 @@ "asset": { "__id__": 0 }, - "fileId": "c1OzcNYGNBlISxvCkFmLgo", + "fileId": "ccz0oCXX9Ow79Q82oif2CI", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "numSkin", + "_name": "sk_skin", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 28 + "__id__": 21 }, "_children": [], "_active": true, "_components": [ { - "__id__": 36 + "__id__": 35 }, { - "__id__": 38 + "__id__": 37 } ], "_prefab": { - "__id__": 40 + "__id__": 39 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 100, "z": 0 }, "_lrot": { @@ -926,8 +857,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1.5, - "y": 1.5, + "x": 2, + "y": 2, "z": 1 }, "_mobility": 0, @@ -946,11 +877,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 37 + "__id__": 36 }, "_contentSize": { "__type__": "cc.Size", @@ -974,11 +905,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 38 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -994,7 +925,7 @@ "__uuid__": "98480b03-176a-4572-87e5-24c15fc93ae9", "__expectedType__": "sp.SkeletonData" }, - "defaultSkin": "金", + "defaultSkin": "土", "defaultAnimation": "待机", "_premultipliedAlpha": false, "_timeScale": 1, @@ -1028,33 +959,33 @@ }, { "__type__": "cc.Node", - "_name": "g1", + "_name": "ui_list", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 28 + "__id__": 21 }, "_children": [ { - "__id__": 42 - }, - { - "__id__": 48 + "__id__": 41 } ], "_active": true, "_components": [ { - "__id__": 54 + "__id__": 69 + }, + { + "__id__": 71 } ], "_prefab": { - "__id__": 56 + "__id__": 73 }, "_lpos": { "__type__": "cc.Vec3", - "x": -80, - "y": 80, + "x": 0, + "y": -91.65499999999997, "z": 0 }, "_lrot": { @@ -1082,20 +1013,80 @@ }, { "__type__": "cc.Node", - "_name": "bg", + "_name": "itemTemplate", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 41 + "__id__": 40 }, - "_children": [], - "_active": true, - "_components": [ + "_children": [ { - "__id__": 43 + "__id__": 42 }, { - "__id__": 45 + "__id__": 48 + }, + { + "__id__": 54 + }, + { + "__id__": 60 + } + ], + "_active": true, + "_components": [ + { + "__id__": 66 + } + ], + "_prefab": { + "__id__": 68 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -272.5, + "y": -110, + "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.Node", + "_name": "bg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 41 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 43 + }, + { + "__id__": 45 } ], "_prefab": { @@ -1144,8 +1135,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 63, - "height": 62 + "width": 165, + "height": 177 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1156,7 +1147,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a00I7B+xVNR5Ig4YAKvHcS" + "fileId": "e9Eap+CCRA9LWWrnpS/OP7" }, { "__type__": "cc.Sprite", @@ -1180,7 +1171,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "6a57e2af-8ae3-4273-8b8f-f9184ff51506@f9941", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 0, "_fillType": 0, "_sizeMode": 1, @@ -1198,7 +1192,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "68VdEij+ZCYZRm1aqgPRVT" + "fileId": "c0ED52sTxAKrPTVwZBNHEF" }, { "__type__": "cc.PrefabInfo", @@ -1208,14 +1202,14 @@ "asset": { "__id__": 0 }, - "fileId": "83AZ28/c5GC5WDvj0nGVAh", + "fileId": "c1OzcNYGNBlISxvCkFmLgo", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "icon", + "_name": "qbg", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -1237,7 +1231,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 15, "z": 0 }, "_lrot": { @@ -1249,8 +1243,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.3, - "y": 0.3, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -1277,8 +1271,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 152, - "height": 135 + "width": 82, + "height": 81 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1289,7 +1283,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ab4KWNMaxJ37emd6hx36wq" + "fileId": "a00I7B+xVNR5Ig4YAKvHcS" }, { "__type__": "cc.Sprite", @@ -1331,48 +1325,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "31ivaH/E1BC7BVNkC2U3D2" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "4dv2YG2CRESad1w6uIp8Wr", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 41 - }, - "_enabled": true, - "__prefab": { - "__id__": 55 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 63, - "height": 62 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "abR41nhdJMZq5HDOGHVApI" + "fileId": "68VdEij+ZCYZRm1aqgPRVT" }, { "__type__": "cc.PrefabInfo", @@ -1382,90 +1335,36 @@ "asset": { "__id__": 0 }, - "fileId": "f0WblNmcFBYLdJZ7pLGGXA", + "fileId": "83AZ28/c5GC5WDvj0nGVAh", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "g2", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 28 - }, - "_children": [ - { - "__id__": 58 - }, - { - "__id__": 64 - } - ], - "_active": true, - "_components": [ - { - "__id__": 70 - } - ], - "_prefab": { - "__id__": 72 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 80, - "y": 80, - "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.Node", - "_name": "bg", + "_name": "icon", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 57 + "__id__": 41 }, "_children": [], "_active": true, "_components": [ { - "__id__": 59 + "__id__": 55 }, { - "__id__": 61 + "__id__": 57 } ], "_prefab": { - "__id__": 63 + "__id__": 59 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 15, "z": 0 }, "_lrot": { @@ -1477,8 +1376,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.4, + "y": 0.4, "z": 1 }, "_mobility": 0, @@ -1497,16 +1396,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 58 + "__id__": 54 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 56 }, "_contentSize": { "__type__": "cc.Size", - "width": 63, - "height": 62 + "width": 179, + "height": 166 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1517,7 +1416,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "80A/+IvpZMXYV1wB+ckyFu" + "fileId": "ab4KWNMaxJ37emd6hx36wq" }, { "__type__": "cc.Sprite", @@ -1525,11 +1424,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 58 + "__id__": 54 }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 58 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1559,7 +1458,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "41MvKeGFFCYZki1qy0SM5h" + "fileId": "31ivaH/E1BC7BVNkC2U3D2" }, { "__type__": "cc.PrefabInfo", @@ -1569,36 +1468,36 @@ "asset": { "__id__": 0 }, - "fileId": "07I4mOQStG4IESWQUGB08A", + "fileId": "4dv2YG2CRESad1w6uIp8Wr", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "icon", + "_name": "lbName", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 57 + "__id__": 41 }, "_children": [], "_active": true, "_components": [ { - "__id__": 65 + "__id__": 61 }, { - "__id__": 67 + "__id__": 63 } ], "_prefab": { - "__id__": 69 + "__id__": 65 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": -40, "z": 0 }, "_lrot": { @@ -1610,8 +1509,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.3, - "y": 0.3, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -1630,16 +1529,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 60 }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 62 }, "_contentSize": { "__type__": "cc.Size", - "width": 152, - "height": 135 + "width": 80, + "height": 50.4 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1650,49 +1549,75 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "0426x6K9xFtp2Ys7RIPFvy" + "fileId": "25i5DcBw1NLoU3mWi/Tmff" }, { - "__type__": "cc.Sprite", + "__type__": "cc.Label", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 64 + "__id__": 60 }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 64 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 0, + "g": 0, + "b": 0, "a": 255 }, - "_spriteFrame": null, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { + "_string": "攻击宝石", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 20, + "_fontSize": 20, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": false, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { "__type__": "cc.Vec2", - "x": 0, - "y": 0 + "x": 2, + "y": 2 }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, + "_shadowBlur": 2, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6fG/c+5G1CtquJD+tu1td0" + "fileId": "3b8/aTYYhEaJ1s16Ln2cNT" }, { "__type__": "cc.PrefabInfo", @@ -1702,7 +1627,7 @@ "asset": { "__id__": 0 }, - "fileId": "0eUPtTy5NAdr8XmEM+1xU6", + "fileId": "2deXeNMElMgqez78nxsCa9", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1713,16 +1638,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 41 }, "_enabled": true, "__prefab": { - "__id__": 71 + "__id__": 67 }, "_contentSize": { "__type__": "cc.Size", - "width": 63, - "height": 62 + "width": 165, + "height": 220 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1733,7 +1658,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "00nrtjfUVJLbqtML5emTXk" + "fileId": "c9UigutyFBq6B1nab4hoHh" }, { "__type__": "cc.PrefabInfo", @@ -1743,40 +1668,122 @@ "asset": { "__id__": 0 }, - "fileId": "barc7vd/hI34ppqbS8Nl/w", + "fileId": "7bRt+q6PFPzI/MK1qxOUGi", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { - "__type__": "cc.Node", - "_name": "g3", + "__type__": "cc.UITransform", + "_name": "", "_objFlags": 0, "__editorExtras__": {}, - "_parent": { - "__id__": 28 + "node": { + "__id__": 40 + }, + "_enabled": true, + "__prefab": { + "__id__": 70 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 750, + "height": 220 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 1 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "75cMn0JphE6ot2wGLc4BnO" + }, + { + "__type__": "cc.Layout", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 40 + }, + "_enabled": true, + "__prefab": { + "__id__": 72 + }, + "_resizeMode": 1, + "_layoutType": 3, + "_cellSize": { + "__type__": "cc.Size", + "width": 40, + "height": 40 + }, + "_startAxis": 0, + "_paddingLeft": 20, + "_paddingRight": 0, + "_paddingTop": 0, + "_paddingBottom": 0, + "_spacingX": 20, + "_spacingY": 0, + "_verticalDirection": 1, + "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, + "_affectedByScale": false, + "_isAlign": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "57NIXWpe9NL705KtAuOdux" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "34ew56KFBEfJppyr83WbqK", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "btnLeft", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 21 }, "_children": [ { - "__id__": 74 - }, - { - "__id__": 80 + "__id__": 75 } ], "_active": true, "_components": [ { - "__id__": 86 + "__id__": 81 + }, + { + "__id__": 83 + }, + { + "__id__": 85 } ], "_prefab": { - "__id__": 88 + "__id__": 87 }, "_lpos": { "__type__": "cc.Vec3", - "x": -80, - "y": -80, + "x": -300, + "y": 100, "z": 0 }, "_lrot": { @@ -1808,20 +1815,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 73 + "__id__": 74 }, "_children": [], "_active": true, "_components": [ { - "__id__": 75 + "__id__": 76 }, { - "__id__": 77 + "__id__": 78 } ], "_prefab": { - "__id__": 79 + "__id__": 80 }, "_lpos": { "__type__": "cc.Vec3", @@ -1858,16 +1865,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 74 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 76 + "__id__": 77 }, "_contentSize": { "__type__": "cc.Size", - "width": 63, - "height": 62 + "width": 46, + "height": 70 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1878,7 +1885,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d2OBJ/TulDD6w9QKmV8zYm" + "fileId": "78avSQmVBK9qdwIzyKizzy" }, { "__type__": "cc.Sprite", @@ -1886,11 +1893,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 74 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 78 + "__id__": 79 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1902,7 +1909,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "d5a2367a-5e87-44d0-95ef-557fae49c3f5@f9941", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 0, "_fillType": 0, "_sizeMode": 1, @@ -1920,7 +1930,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "4d0Gzq3Q1BmqfTZp/gM7Th" + "fileId": "c4SQCmJepA6Z6c2cXk7D6F" }, { "__type__": "cc.PrefabInfo", @@ -1930,68 +1940,18 @@ "asset": { "__id__": 0 }, - "fileId": "69pSzzo65Pq5NvKjc94eUo", + "fileId": "6eLcFsky1MH7XzKtsIVBcv", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Node", - "_name": "icon", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 73 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 81 - }, - { - "__id__": 83 - } - ], - "_prefab": { - "__id__": 85 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 0.3, - "y": 0.3, - "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__": 80 + "__id__": 74 }, "_enabled": true, "__prefab": { @@ -1999,8 +1959,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 152, - "height": 135 + "width": 200, + "height": 300 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2011,90 +1971,81 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "da5JD5S0NIHpAjujLfnXnV" + "fileId": "9cpx17Q+ZN176EJ2dr77ML" }, { - "__type__": "cc.Sprite", + "__type__": "cc.Button", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 80 + "__id__": 74 }, "_enabled": true, "__prefab": { "__id__": 84 }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { + "clickEvents": [], + "_interactable": true, + "_transition": 3, + "_normalColor": { "__type__": "cc.Color", "r": 255, "g": 255, "b": 255, "a": 255 }, - "_spriteFrame": null, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_normalSprite": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, + "_duration": 0.1, + "_zoomScale": 1.2, + "_target": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8adVRiwRdE8p1uVZvCEUtC" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "d176dImhpBfZmh/lAUb0rQ", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null + "fileId": "29U3fu+a9I2J5iy4oyQdg8" }, { - "__type__": "cc.UITransform", + "__type__": "01072pOfZNI5LNG77/ogzuD", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 73 + "__id__": 74 }, "_enabled": true, "__prefab": { - "__id__": 87 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 63, - "height": 62 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 + "__id__": 86 }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "23SYV8DoFJzpyftInciwMS" + "fileId": "6683emg0VHfKpOSAhQchka" }, { "__type__": "cc.PrefabInfo", @@ -2104,40 +2055,43 @@ "asset": { "__id__": 0 }, - "fileId": "16OCdE2BtFLJC+j7aiE7HB", + "fileId": "da6b+paApEPoVOdGjxXHao", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "g4", + "_name": "btnRight", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 28 + "__id__": 21 }, "_children": [ { - "__id__": 90 - }, - { - "__id__": 96 + "__id__": 89 } ], "_active": true, "_components": [ { - "__id__": 102 + "__id__": 95 + }, + { + "__id__": 97 + }, + { + "__id__": 99 } ], "_prefab": { - "__id__": 104 + "__id__": 101 }, "_lpos": { "__type__": "cc.Vec3", - "x": 80, - "y": -80, + "x": 300, + "y": 100, "z": 0 }, "_lrot": { @@ -2169,20 +2123,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 89 + "__id__": 88 }, "_children": [], "_active": true, "_components": [ { - "__id__": 91 + "__id__": 90 }, { - "__id__": 93 + "__id__": 92 } ], "_prefab": { - "__id__": 95 + "__id__": 94 }, "_lpos": { "__type__": "cc.Vec3", @@ -2199,7 +2153,7 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, + "x": -1, "y": 1, "z": 1 }, @@ -2219,16 +2173,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 90 + "__id__": 89 }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 91 }, "_contentSize": { "__type__": "cc.Size", - "width": 63, - "height": 62 + "width": 46, + "height": 70 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2239,7 +2193,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1dldbmFI1FFI57H5dD95F6" + "fileId": "ffrYwEIHtEX6+eXb3gJrHt" }, { "__type__": "cc.Sprite", @@ -2247,11 +2201,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 90 + "__id__": 89 }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 93 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2263,7 +2217,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "d5a2367a-5e87-44d0-95ef-557fae49c3f5@f9941", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 0, "_fillType": 0, "_sizeMode": 1, @@ -2281,7 +2238,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8e9GQVLMJN34s4rjDzOiJY" + "fileId": "82oBItLcBOLqojKkTLCk0x" }, { "__type__": "cc.PrefabInfo", @@ -2291,77 +2248,27 @@ "asset": { "__id__": 0 }, - "fileId": "fegaCdBxdLwIxfM5Y7zhKC", + "fileId": "38EIw6gJZIsrtjQ/xFIkP3", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Node", - "_name": "icon", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 89 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 97 - }, - { - "__id__": 99 - } - ], - "_prefab": { - "__id__": 101 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 0.3, - "y": 0.3, - "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__": 96 + "__id__": 88 }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 96 }, "_contentSize": { "__type__": "cc.Size", - "width": 152, - "height": 135 + "width": 200, + "height": 300 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2372,131 +2279,81 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ceCcPbqDxAGqxXyQAn/Dnw" + "fileId": "b8aHkxvpNN+YAbBi+49Z2K" }, { - "__type__": "cc.Sprite", + "__type__": "cc.Button", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 96 + "__id__": 88 }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 98 }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { + "clickEvents": [], + "_interactable": true, + "_transition": 3, + "_normalColor": { "__type__": "cc.Color", "r": 255, "g": 255, "b": 255, "a": 255 }, - "_spriteFrame": null, - "_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": "e3+oKq7sNI9q7snjtmjsoF" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "0dEDitY8lLQaL3+oQ0gXO9", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 89 - }, - "_enabled": true, - "__prefab": { - "__id__": 103 + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 63, - "height": 62 + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 }, + "_normalSprite": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, + "_duration": 0.1, + "_zoomScale": 1.2, + "_target": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "56hENVC3FMVooa8LJCxO64" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "3czrFLW75KP63o2LOQepy5", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null + "fileId": "65aab4WhtCXZnZym/oe6R3" }, { - "__type__": "cc.UITransform", + "__type__": "01072pOfZNI5LNG77/ogzuD", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 28 + "__id__": 88 }, "_enabled": true, "__prefab": { - "__id__": 106 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 220, - "height": 220 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 + "__id__": 100 }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c9UigutyFBq6B1nab4hoHh" + "fileId": "d8UZhi+uZEJrn4cVX8YgJY" }, { "__type__": "cc.PrefabInfo", @@ -2506,7 +2363,7 @@ "asset": { "__id__": 0 }, - "fileId": "7bRt+q6PFPzI/MK1qxOUGi", + "fileId": "97ArrmDZhLhqXPAptdk9QZ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2517,65 +2374,63 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 27 + "__id__": 21 }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 103 }, "_contentSize": { "__type__": "cc.Size", "width": 750, - "height": 220 + "height": 676 }, "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 1 + "y": 0.5 }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "75cMn0JphE6ot2wGLc4BnO" + "fileId": "6bJdC0ZUBOv6Sv5K8ol+z1" }, { - "__type__": "cc.Layout", + "__type__": "cc.Widget", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 27 + "__id__": 21 }, "_enabled": true, "__prefab": { - "__id__": 111 - }, - "_resizeMode": 1, - "_layoutType": 3, - "_cellSize": { - "__type__": "cc.Size", - "width": 40, - "height": 40 + "__id__": 105 }, - "_startAxis": 0, - "_paddingLeft": 30, - "_paddingRight": 30, - "_paddingTop": 0, - "_paddingBottom": 0, - "_spacingX": 15, - "_spacingY": 30, - "_verticalDirection": 1, - "_horizontalDirection": 0, - "_constraint": 0, - "_constraintNum": 2, - "_affectedByScale": false, - "_isAlign": false, + "_alignFlags": 4, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 778.762, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "57NIXWpe9NL705KtAuOdux" + "fileId": "6e/gmOgCRN6ajp5e4sFWvQ" }, { "__type__": "cc.PrefabInfo", @@ -2585,36 +2440,49 @@ "asset": { "__id__": 0 }, - "fileId": "34ew56KFBEfJppyr83WbqK", + "fileId": "6bDNTk26ZGlb7wAfxR1GGs", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "分割线", + "_name": "down", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 14 }, - "_children": [], + "_children": [ + { + "__id__": 108 + }, + { + "__id__": 114 + }, + { + "__id__": 132 + }, + { + "__id__": 234 + } + ], "_active": true, "_components": [ { - "__id__": 114 + "__id__": 244 }, { - "__id__": 116 + "__id__": 246 } ], "_prefab": { - "__id__": 118 + "__id__": 248 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 86.876, + "y": -440, "z": 0 }, "_lrot": { @@ -2641,117 +2509,31 @@ "_id": "" }, { - "__type__": "cc.UITransform", - "_name": "", + "__type__": "cc.Node", + "_name": "下方框体", "_objFlags": 0, "__editorExtras__": {}, - "node": { - "__id__": 113 + "_parent": { + "__id__": 107 }, - "_enabled": true, - "__prefab": { - "__id__": 115 + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 109 + }, + { + "__id__": 111 + } + ], + "_prefab": { + "__id__": 113 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 696, - "height": 3 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "92MRTCYKpDA7oXI1Nq60/h" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 113 - }, - "_enabled": true, - "__prefab": { - "__id__": 117 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "08bf9cf3-f2f4-4917-84ff-6b81a6831d80@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": "dc6TrhavpE6KuVVqfwAvRZ" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "04gZoEsThLuYy3ExweBqya", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "宝石仓库", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 14 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 120 - }, - { - "__id__": 122 - } - ], - "_prefab": { - "__id__": 124 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 30.287, - "z": 0 + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 }, "_lrot": { "__type__": "cc.Quat", @@ -2782,16 +2564,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 119 + "__id__": 108 }, "_enabled": true, "__prefab": { - "__id__": 121 + "__id__": 110 }, "_contentSize": { "__type__": "cc.Size", - "width": 250, - "height": 62 + "width": 757, + "height": 788 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2802,7 +2584,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "9c5I3F0Q1G+reyF3Ule1lZ" + "fileId": "d07OxlmttJIIfmbA+Oc2GY" }, { "__type__": "cc.Sprite", @@ -2810,11 +2592,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 119 + "__id__": 108 }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 112 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2827,7 +2609,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "7a8f8fea-21d5-4470-8aef-e10719fe9569@f9941", + "__uuid__": "b8231678-85e2-4725-a202-c9d1b3bdc4b5@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -2847,7 +2629,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f1RLj9nzdC4ZaO1b2n/Y6e" + "fileId": "81JGVF9t5I0r9sLQSiL3Ku" }, { "__type__": "cc.PrefabInfo", @@ -2857,46 +2639,40 @@ "asset": { "__id__": 0 }, - "fileId": "95safsrT5Gf5Tl+oY84j46", + "fileId": "99nJJMCCxHSYYfu0FhniFe", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "btnClose", + "_name": "ui_content", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 14 + "__id__": 107 }, "_children": [ { - "__id__": 126 - }, - { - "__id__": 132 + "__id__": 115 } ], "_active": true, "_components": [ { - "__id__": 138 - }, - { - "__id__": 140 + "__id__": 127 }, { - "__id__": 142 + "__id__": 129 } ], "_prefab": { - "__id__": 144 + "__id__": 131 }, "_lpos": { "__type__": "cc.Vec3", - "x": -233.893, - "y": 729.542, + "x": 0, + "y": 333.976, "z": 0 }, "_lrot": { @@ -2924,53 +2700,153 @@ }, { "__type__": "cc.Node", - "_name": "icon", "_objFlags": 0, - "__editorExtras__": {}, "_parent": { - "__id__": 125 + "__id__": 114 }, - "_children": [], - "_active": true, - "_components": [ + "_prefab": { + "__id__": 116 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 115 + }, + "asset": { + "__uuid__": "4fbd0ba7-162d-4cf5-aa2d-f70e894dc750", + "__expectedType__": "cc.Prefab" + }, + "fileId": "4dFXetvaVEeIOJ7mZ9flfE", + "instance": { + "__id__": 117 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "62YfMfzXtBnbss07X6v561", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ { - "__id__": 127 + "__id__": 118 }, { - "__id__": 129 + "__id__": 120 + }, + { + "__id__": 121 + }, + { + "__id__": 122 + }, + { + "__id__": 123 + }, + { + "__id__": 125 } ], - "_prefab": { - "__id__": 131 + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 119 }, - "_lpos": { + "propertyPath": [ + "_name" + ], + "value": "bagItemTemplate" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "4dFXetvaVEeIOJ7mZ9flfE" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 119 + }, + "propertyPath": [ + "_lpos" + ], + "value": { "__type__": "cc.Vec3", - "x": -99.749, - "y": 0, + "x": -300, + "y": -50, "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 119 }, - "_lrot": { + "propertyPath": [ + "_lrot" + ], + "value": { "__type__": "cc.Quat", "x": 0, "y": 0, "z": 0, "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 119 }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 33554432, - "_euler": { + "propertyPath": [ + "_euler" + ], + "value": { "__type__": "cc.Vec3", "x": 0, "y": 0, "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 124 }, - "_id": "" + "propertyPath": [ + "_spriteFrame" + ], + "value": null + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "624ipo6HlMK4N1CWRxBUpl" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 126 + }, + "propertyPath": [ + "_spriteFrame" + ], + "value": null + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "45m8FTiZdLqaQLMbpQ4vvD" + ] }, { "__type__": "cc.UITransform", @@ -2978,7 +2854,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 126 + "__id__": 114 }, "_enabled": true, "__prefab": { @@ -2986,64 +2862,57 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 64, - "height": 54 + "width": 700, + "height": 130 }, "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 1 }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3am0E7gJxG6KEinkzCpt4M" + "fileId": "edbEpbdmtFo73n39s0+rUh" }, { - "__type__": "cc.Sprite", + "__type__": "cc.Layout", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 126 + "__id__": 114 }, "_enabled": true, "__prefab": { "__id__": 130 }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "158044a5-4418-4a89-9a6f-68bf0cb58c53@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 + "_resizeMode": 1, + "_layoutType": 3, + "_cellSize": { + "__type__": "cc.Size", + "width": 40, + "height": 40 }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, + "_startAxis": 0, + "_paddingLeft": 0, + "_paddingRight": 0, + "_paddingTop": 0, + "_paddingBottom": 30, + "_spacingX": 20, + "_spacingY": 20, + "_verticalDirection": 1, + "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, + "_affectedByScale": false, + "_isAlign": false, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2f91o1LxlCG7gAqJ/7Z0Zq" + "fileId": "0ay2CEpx5F5Jgcp2ih0RlT" }, { "__type__": "cc.PrefabInfo", @@ -3053,35 +2922,92 @@ "asset": { "__id__": 0 }, - "fileId": "9al0xZidlIIppKRsN5zSje", + "fileId": "9ajpLwZXNDc64luU/93oPi", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "返回首页", + "_name": "tags", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 107 + }, + "_children": [ + { + "__id__": 133 + }, + { + "__id__": 139 + } + ], + "_active": true, + "_components": [ + { + "__id__": 229 + }, + { + "__id__": 231 + } + ], + "_prefab": { + "__id__": 233 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -173.12900000000002, + "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.Node", + "_name": "ui_tagBtnBg", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 125 + "__id__": 132 }, "_children": [], "_active": true, "_components": [ { - "__id__": 133 + "__id__": 134 }, { - "__id__": 135 + "__id__": 136 } ], "_prefab": { - "__id__": 137 + "__id__": 138 }, "_lpos": { "__type__": "cc.Vec3", - "x": 28.287, + "x": -250, "y": 0, "z": 0 }, @@ -3114,16 +3040,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 132 + "__id__": 133 }, "_enabled": true, "__prefab": { - "__id__": 134 + "__id__": 135 }, "_contentSize": { "__type__": "cc.Size", - "width": 183, - "height": 48 + "width": 113, + "height": 64 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3134,7 +3060,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "4drjfNNs9P2YKfMhYVayuq" + "fileId": "33mdzJRQNEAq4qZfcnptRR" }, { "__type__": "cc.Sprite", @@ -3142,11 +3068,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 132 + "__id__": 133 }, "_enabled": true, "__prefab": { - "__id__": 136 + "__id__": 137 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3159,7 +3085,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "979194e7-bb64-4549-9d9c-301c7c4e3d90@f9941", + "__uuid__": "1d264c4d-4e20-4942-8557-eecfde1025cd@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -3179,7 +3105,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e67hI86ZxAS47IDRdLp1fZ" + "fileId": "a8zBIZJuRGHIuy04CdOh5n" }, { "__type__": "cc.PrefabInfo", @@ -3189,155 +3115,162 @@ "asset": { "__id__": 0 }, - "fileId": "7cRzWQz+9PepbvhqMac6mD", + "fileId": "23DqK0T0ZED7fWxfkrBSop", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { - "__type__": "cc.UITransform", - "_name": "", + "__type__": "cc.Node", + "_name": "ui_tagBtns", "_objFlags": 0, "__editorExtras__": {}, - "node": { - "__id__": 125 + "_parent": { + "__id__": 132 }, - "_enabled": true, - "__prefab": { - "__id__": 139 + "_children": [ + { + "__id__": 140 + }, + { + "__id__": 154 + }, + { + "__id__": 168 + }, + { + "__id__": 182 + }, + { + "__id__": 196 + }, + { + "__id__": 210 + } + ], + "_active": true, + "_components": [ + { + "__id__": 224 + }, + { + "__id__": 226 + } + ], + "_prefab": { + "__id__": 228 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 250, - "height": 100 + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 + "_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.CompPrefabInfo", - "fileId": "efHVbm50BJubO5S5I/bHlB" - }, - { - "__type__": "cc.Button", - "_name": "", + "__type__": "cc.Node", + "_name": "btn0", "_objFlags": 0, "__editorExtras__": {}, - "node": { - "__id__": 125 + "_parent": { + "__id__": 139 }, - "_enabled": true, - "__prefab": { - "__id__": 141 + "_children": [ + { + "__id__": 141 + } + ], + "_active": true, + "_components": [ + { + "__id__": 147 + }, + { + "__id__": 149 + }, + { + "__id__": 151 + } + ], + "_prefab": { + "__id__": 153 }, - "clickEvents": [], - "_interactable": true, - "_transition": 3, - "_normalColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 + "_lpos": { + "__type__": "cc.Vec3", + "x": -250, + "y": 0, + "z": 0 }, - "_hoverColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 }, - "_pressedColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_disabledColor": { - "__type__": "cc.Color", - "r": 124, - "g": 124, - "b": 124, - "a": 255 - }, - "_normalSprite": null, - "_hoverSprite": null, - "_pressedSprite": null, - "_disabledSprite": null, - "_duration": 0.1, - "_zoomScale": 1.2, - "_target": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "6eIacPOqFMdZ5bh5srLZ9Q" - }, - { - "__type__": "01072pOfZNI5LNG77/ogzuD", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 125 + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 }, - "_enabled": true, - "__prefab": { - "__id__": 143 + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 }, "_id": "" }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ccyOaNJsRMiLsDlYQhD8BS" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "09ddntFHRD1a1MLlocXvPE", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, { "__type__": "cc.Node", - "_name": "ui_content", + "_name": "Label", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 14 + "__id__": 140 }, - "_children": [ - { - "__id__": 146 - } - ], + "_children": [], "_active": true, "_components": [ { - "__id__": 154 + "__id__": 142 }, { - "__id__": 156 + "__id__": 144 } ], "_prefab": { - "__id__": 158 + "__id__": 146 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -22.638000000000034, + "y": 0, "z": 0 }, "_lrot": { @@ -3363,320 +3296,131 @@ }, "_id": "" }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 145 - }, - "_prefab": { - "__id__": 147 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 146 - }, - "asset": { - "__uuid__": "4fbd0ba7-162d-4cf5-aa2d-f70e894dc750", - "__expectedType__": "cc.Prefab" - }, - "fileId": "4dFXetvaVEeIOJ7mZ9flfE", - "instance": { - "__id__": 148 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "62YfMfzXtBnbss07X6v561", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 149 - }, - { - "__id__": 151 - }, - { - "__id__": 152 - }, - { - "__id__": 153 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 150 - }, - "propertyPath": [ - "_name" - ], - "value": "bagItemTemplate" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "4dFXetvaVEeIOJ7mZ9flfE" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 150 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": -300, - "y": -50, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 150 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 150 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, { "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 145 + "__id__": 141 }, "_enabled": true, "__prefab": { - "__id__": 155 + "__id__": 143 }, "_contentSize": { "__type__": "cc.Size", - "width": 700, - "height": 130 + "width": 64, + "height": 54.4 }, "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 1 + "y": 0.5 }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "edbEpbdmtFo73n39s0+rUh" + "fileId": "c5DUS8wtlFApuHJ/nH6q8N" }, { - "__type__": "cc.Layout", + "__type__": "cc.Label", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 145 + "__id__": 141 }, "_enabled": true, "__prefab": { - "__id__": 157 - }, - "_resizeMode": 1, - "_layoutType": 3, - "_cellSize": { - "__type__": "cc.Size", - "width": 40, - "height": 40 - }, - "_startAxis": 0, - "_paddingLeft": 0, - "_paddingRight": 0, - "_paddingTop": 0, - "_paddingBottom": 30, - "_spacingX": 20, - "_spacingY": 20, - "_verticalDirection": 1, - "_horizontalDirection": 0, - "_constraint": 0, - "_constraintNum": 2, - "_affectedByScale": false, - "_isAlign": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "0ay2CEpx5F5Jgcp2ih0RlT" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "9ajpLwZXNDc64luU/93oPi", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "tags", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 14 - }, - "_children": [ - { - "__id__": 160 - }, - { - "__id__": 166 - } - ], - "_active": true, - "_components": [ - { - "__id__": 256 - }, - { - "__id__": 258 - } - ], - "_prefab": { - "__id__": 260 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -549.89, - "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.Node", - "_name": "ui_tagBtnBg", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 159 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 161 - }, - { - "__id__": 163 - } - ], - "_prefab": { - "__id__": 165 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -250, - "y": 0, - "z": 0 + "__id__": 145 }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 + "_string": "通用", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 30, + "_fontSize": 30, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 }, - "_mobility": 0, - "_layer": 33554432, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 }, + "_shadowBlur": 2, "_id": "" }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "femYFc2YVLaZZ0Hg49sACk" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "51eX6V+LFGdbM3qgggI5hx", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 160 + "__id__": 140 }, "_enabled": true, "__prefab": { - "__id__": 162 + "__id__": 148 }, "_contentSize": { "__type__": "cc.Size", - "width": 113, - "height": 64 + "width": 100, + "height": 100 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3687,52 +3431,81 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "33mdzJRQNEAq4qZfcnptRR" + "fileId": "34rf1mOsVPiYuPqAL2B3l5" }, { - "__type__": "cc.Sprite", + "__type__": "cc.Button", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 160 + "__id__": 140 }, "_enabled": true, "__prefab": { - "__id__": 164 + "__id__": 150 }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { + "clickEvents": [], + "_interactable": true, + "_transition": 0, + "_normalColor": { "__type__": "cc.Color", "r": 255, "g": 255, "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "1d264c4d-4e20-4942-8557-eecfde1025cd@f9941", - "__expectedType__": "cc.SpriteFrame" + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_normalSprite": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, + "_duration": 0.1, + "_zoomScale": 1.2, + "_target": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a8zBIZJuRGHIuy04CdOh5n" + "fileId": "5aOtCVyT5Hj7I6O0mdVgZV" + }, + { + "__type__": "01072pOfZNI5LNG77/ogzuD", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 140 + }, + "_enabled": true, + "__prefab": { + "__id__": 152 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "39/7wd4QJBUJP2kpccp00a" }, { "__type__": "cc.PrefabInfo", @@ -3742,111 +3515,42 @@ "asset": { "__id__": 0 }, - "fileId": "23DqK0T0ZED7fWxfkrBSop", + "fileId": "2c+6yDPupEVZfHj/+j2NWj", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "ui_tagBtns", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 159 - }, - "_children": [ - { - "__id__": 167 - }, - { - "__id__": 181 - }, - { - "__id__": 195 - }, - { - "__id__": 209 - }, - { - "__id__": 223 - }, - { - "__id__": 237 - } - ], - "_active": true, - "_components": [ - { - "__id__": 251 - }, - { - "__id__": 253 - } - ], - "_prefab": { - "__id__": 255 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "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.Node", - "_name": "btn0", + "_name": "btn1", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 166 + "__id__": 139 }, "_children": [ { - "__id__": 168 + "__id__": 155 } ], "_active": true, "_components": [ { - "__id__": 174 + "__id__": 161 }, { - "__id__": 176 + "__id__": 163 }, { - "__id__": 178 + "__id__": 165 } ], "_prefab": { - "__id__": 180 + "__id__": 167 }, "_lpos": { "__type__": "cc.Vec3", - "x": -250, + "x": -150, "y": 0, "z": 0 }, @@ -3879,20 +3583,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 167 + "__id__": 154 }, "_children": [], "_active": true, "_components": [ { - "__id__": 169 + "__id__": 156 }, { - "__id__": 171 + "__id__": 158 } ], "_prefab": { - "__id__": 173 + "__id__": 160 }, "_lpos": { "__type__": "cc.Vec3", @@ -3929,15 +3633,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 168 + "__id__": 155 }, "_enabled": true, "__prefab": { - "__id__": 170 + "__id__": 157 }, "_contentSize": { "__type__": "cc.Size", - "width": 64, + "width": 34, "height": 54.4 }, "_anchorPoint": { @@ -3949,7 +3653,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c5DUS8wtlFApuHJ/nH6q8N" + "fileId": "a1nc22gB9FCIAPMyzhP0Kk" }, { "__type__": "cc.Label", @@ -3957,11 +3661,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 168 + "__id__": 155 }, "_enabled": true, "__prefab": { - "__id__": 172 + "__id__": 159 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3973,7 +3677,7 @@ "b": 255, "a": 255 }, - "_string": "通用", + "_string": "金", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 30, @@ -4017,7 +3721,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "femYFc2YVLaZZ0Hg49sACk" + "fileId": "aeDdI/U0JBvJi8EMslDi2b" }, { "__type__": "cc.PrefabInfo", @@ -4027,7 +3731,7 @@ "asset": { "__id__": 0 }, - "fileId": "51eX6V+LFGdbM3qgggI5hx", + "fileId": "79H87a8k1D8K/PHFvT2Xh2", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4038,11 +3742,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 154 }, "_enabled": true, "__prefab": { - "__id__": 175 + "__id__": 162 }, "_contentSize": { "__type__": "cc.Size", @@ -4058,7 +3762,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "34rf1mOsVPiYuPqAL2B3l5" + "fileId": "13XZd+sbtP3qDq3n07a5XW" }, { "__type__": "cc.Button", @@ -4066,11 +3770,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 154 }, "_enabled": true, "__prefab": { - "__id__": 177 + "__id__": 164 }, "clickEvents": [], "_interactable": true, @@ -4114,7 +3818,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5aOtCVyT5Hj7I6O0mdVgZV" + "fileId": "64vIox+oBMuKGI5zKtTDIX" }, { "__type__": "01072pOfZNI5LNG77/ogzuD", @@ -4122,17 +3826,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 154 }, "_enabled": true, "__prefab": { - "__id__": 179 + "__id__": 166 }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "39/7wd4QJBUJP2kpccp00a" + "fileId": "34DvV/S05MMrk14X+B9rCt" }, { "__type__": "cc.PrefabInfo", @@ -4142,42 +3846,42 @@ "asset": { "__id__": 0 }, - "fileId": "2c+6yDPupEVZfHj/+j2NWj", + "fileId": "4fPZoCuhdNIq80ytM3plku", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "btn1", + "_name": "btn2", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 166 + "__id__": 139 }, "_children": [ { - "__id__": 182 + "__id__": 169 } ], "_active": true, "_components": [ { - "__id__": 188 + "__id__": 175 }, { - "__id__": 190 + "__id__": 177 }, { - "__id__": 192 + "__id__": 179 } ], "_prefab": { - "__id__": 194 + "__id__": 181 }, "_lpos": { "__type__": "cc.Vec3", - "x": -150, + "x": -50, "y": 0, "z": 0 }, @@ -4210,20 +3914,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 181 + "__id__": 168 }, "_children": [], "_active": true, "_components": [ { - "__id__": 183 + "__id__": 170 }, { - "__id__": 185 + "__id__": 172 } ], "_prefab": { - "__id__": 187 + "__id__": 174 }, "_lpos": { "__type__": "cc.Vec3", @@ -4260,11 +3964,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 182 + "__id__": 169 }, "_enabled": true, "__prefab": { - "__id__": 184 + "__id__": 171 }, "_contentSize": { "__type__": "cc.Size", @@ -4280,7 +3984,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a1nc22gB9FCIAPMyzhP0Kk" + "fileId": "3aniHY4/hFF6pL6n+jbfvj" }, { "__type__": "cc.Label", @@ -4288,11 +3992,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 182 + "__id__": 169 }, "_enabled": true, "__prefab": { - "__id__": 186 + "__id__": 173 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4304,7 +4008,7 @@ "b": 255, "a": 255 }, - "_string": "金", + "_string": "木", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 30, @@ -4348,7 +4052,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "aeDdI/U0JBvJi8EMslDi2b" + "fileId": "0en0u2UJROg7FAdLkMs15x" }, { "__type__": "cc.PrefabInfo", @@ -4358,7 +4062,7 @@ "asset": { "__id__": 0 }, - "fileId": "79H87a8k1D8K/PHFvT2Xh2", + "fileId": "983zE3ov1I864wopTzpm/l", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4369,11 +4073,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 181 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 189 + "__id__": 176 }, "_contentSize": { "__type__": "cc.Size", @@ -4389,7 +4093,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "13XZd+sbtP3qDq3n07a5XW" + "fileId": "aaHfdK0cFDcI/ECn4DAnsq" }, { "__type__": "cc.Button", @@ -4397,11 +4101,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 181 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 191 + "__id__": 178 }, "clickEvents": [], "_interactable": true, @@ -4445,7 +4149,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "64vIox+oBMuKGI5zKtTDIX" + "fileId": "9bjMnn5HBBM75wPq7H6E/S" }, { "__type__": "01072pOfZNI5LNG77/ogzuD", @@ -4453,17 +4157,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 181 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 193 + "__id__": 180 }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "34DvV/S05MMrk14X+B9rCt" + "fileId": "0exC0OhmFJk68ywT2XNMEI" }, { "__type__": "cc.PrefabInfo", @@ -4473,42 +4177,42 @@ "asset": { "__id__": 0 }, - "fileId": "4fPZoCuhdNIq80ytM3plku", + "fileId": "24+xm74OdNDqEIIRR/71h7", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "btn2", + "_name": "btn3", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 166 + "__id__": 139 }, "_children": [ { - "__id__": 196 + "__id__": 183 } ], "_active": true, "_components": [ { - "__id__": 202 + "__id__": 189 }, { - "__id__": 204 + "__id__": 191 }, { - "__id__": 206 + "__id__": 193 } ], "_prefab": { - "__id__": 208 + "__id__": 195 }, "_lpos": { "__type__": "cc.Vec3", - "x": -50, + "x": 50, "y": 0, "z": 0 }, @@ -4541,20 +4245,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 195 + "__id__": 182 }, "_children": [], "_active": true, "_components": [ { - "__id__": 197 + "__id__": 184 }, { - "__id__": 199 + "__id__": 186 } ], "_prefab": { - "__id__": 201 + "__id__": 188 }, "_lpos": { "__type__": "cc.Vec3", @@ -4591,11 +4295,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 196 + "__id__": 183 }, "_enabled": true, "__prefab": { - "__id__": 198 + "__id__": 185 }, "_contentSize": { "__type__": "cc.Size", @@ -4611,7 +4315,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3aniHY4/hFF6pL6n+jbfvj" + "fileId": "e3eEV4aItDYrjWqpDJhftZ" }, { "__type__": "cc.Label", @@ -4619,11 +4323,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 196 + "__id__": 183 }, "_enabled": true, "__prefab": { - "__id__": 200 + "__id__": 187 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4635,7 +4339,7 @@ "b": 255, "a": 255 }, - "_string": "木", + "_string": "水", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 30, @@ -4679,7 +4383,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "0en0u2UJROg7FAdLkMs15x" + "fileId": "f3zFEhfvRME7JsVzWkzGAC" }, { "__type__": "cc.PrefabInfo", @@ -4689,7 +4393,7 @@ "asset": { "__id__": 0 }, - "fileId": "983zE3ov1I864wopTzpm/l", + "fileId": "e3u15uNp5KO4HiUN+zmtoT", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4700,11 +4404,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 195 + "__id__": 182 }, "_enabled": true, "__prefab": { - "__id__": 203 + "__id__": 190 }, "_contentSize": { "__type__": "cc.Size", @@ -4720,7 +4424,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "aaHfdK0cFDcI/ECn4DAnsq" + "fileId": "e3TPxSadxIspssCuSx+7nw" }, { "__type__": "cc.Button", @@ -4728,11 +4432,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 195 + "__id__": 182 }, "_enabled": true, "__prefab": { - "__id__": 205 + "__id__": 192 }, "clickEvents": [], "_interactable": true, @@ -4776,7 +4480,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "9bjMnn5HBBM75wPq7H6E/S" + "fileId": "85LEMfF81HNqI8GVXe2qE3" }, { "__type__": "01072pOfZNI5LNG77/ogzuD", @@ -4784,17 +4488,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 195 + "__id__": 182 }, "_enabled": true, "__prefab": { - "__id__": 207 + "__id__": 194 }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "0exC0OhmFJk68ywT2XNMEI" + "fileId": "c6C2Avt8tHs49pSHbKstjd" }, { "__type__": "cc.PrefabInfo", @@ -4804,42 +4508,42 @@ "asset": { "__id__": 0 }, - "fileId": "24+xm74OdNDqEIIRR/71h7", + "fileId": "7bXUMs2aRMq5cZQFjfOsuu", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "btn3", + "_name": "btn4", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 166 + "__id__": 139 }, "_children": [ { - "__id__": 210 + "__id__": 197 } ], "_active": true, "_components": [ { - "__id__": 216 + "__id__": 203 }, { - "__id__": 218 + "__id__": 205 }, { - "__id__": 220 + "__id__": 207 } ], "_prefab": { - "__id__": 222 + "__id__": 209 }, "_lpos": { "__type__": "cc.Vec3", - "x": 50, + "x": 150, "y": 0, "z": 0 }, @@ -4872,20 +4576,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 209 + "__id__": 196 }, "_children": [], "_active": true, "_components": [ { - "__id__": 211 + "__id__": 198 }, { - "__id__": 213 + "__id__": 200 } ], "_prefab": { - "__id__": 215 + "__id__": 202 }, "_lpos": { "__type__": "cc.Vec3", @@ -4922,11 +4626,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 210 + "__id__": 197 }, "_enabled": true, "__prefab": { - "__id__": 212 + "__id__": 199 }, "_contentSize": { "__type__": "cc.Size", @@ -4942,7 +4646,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e3eEV4aItDYrjWqpDJhftZ" + "fileId": "e1hgMPWt5FgZTUBsVwEjI8" }, { "__type__": "cc.Label", @@ -4950,11 +4654,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 210 + "__id__": 197 }, "_enabled": true, "__prefab": { - "__id__": 214 + "__id__": 201 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4966,7 +4670,7 @@ "b": 255, "a": 255 }, - "_string": "水", + "_string": "火", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 30, @@ -5010,7 +4714,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f3zFEhfvRME7JsVzWkzGAC" + "fileId": "52oUTZtARKH5DF2j1bbhhz" }, { "__type__": "cc.PrefabInfo", @@ -5020,7 +4724,7 @@ "asset": { "__id__": 0 }, - "fileId": "e3u15uNp5KO4HiUN+zmtoT", + "fileId": "a8cEIQ6fVFP7YWCYooTNeV", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5031,11 +4735,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 209 + "__id__": 196 }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 204 }, "_contentSize": { "__type__": "cc.Size", @@ -5051,7 +4755,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e3TPxSadxIspssCuSx+7nw" + "fileId": "3dVnFLZIRNrLnkJOWC/o1j" }, { "__type__": "cc.Button", @@ -5059,11 +4763,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 209 + "__id__": 196 }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 206 }, "clickEvents": [], "_interactable": true, @@ -5107,7 +4811,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "85LEMfF81HNqI8GVXe2qE3" + "fileId": "69WY+4jlZHf4dYoWC5sqts" }, { "__type__": "01072pOfZNI5LNG77/ogzuD", @@ -5115,17 +4819,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 209 + "__id__": 196 }, "_enabled": true, "__prefab": { - "__id__": 221 + "__id__": 208 }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c6C2Avt8tHs49pSHbKstjd" + "fileId": "fcM8/A2JdCS5kfh9d6iNkf" }, { "__type__": "cc.PrefabInfo", @@ -5135,42 +4839,42 @@ "asset": { "__id__": 0 }, - "fileId": "7bXUMs2aRMq5cZQFjfOsuu", + "fileId": "f21UjeC1JMYJifKTvuzg5C", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "btn4", + "_name": "btn5", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 166 + "__id__": 139 }, "_children": [ { - "__id__": 224 + "__id__": 211 } ], "_active": true, "_components": [ { - "__id__": 230 + "__id__": 217 }, { - "__id__": 232 + "__id__": 219 }, { - "__id__": 234 + "__id__": 221 } ], "_prefab": { - "__id__": 236 + "__id__": 223 }, "_lpos": { "__type__": "cc.Vec3", - "x": 150, + "x": 250, "y": 0, "z": 0 }, @@ -5203,20 +4907,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 223 + "__id__": 210 }, "_children": [], "_active": true, "_components": [ { - "__id__": 225 + "__id__": 212 }, { - "__id__": 227 + "__id__": 214 } ], "_prefab": { - "__id__": 229 + "__id__": 216 }, "_lpos": { "__type__": "cc.Vec3", @@ -5253,11 +4957,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 224 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 226 + "__id__": 213 }, "_contentSize": { "__type__": "cc.Size", @@ -5273,7 +4977,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e1hgMPWt5FgZTUBsVwEjI8" + "fileId": "0bNoGbzKJO/pRTTFitG99E" }, { "__type__": "cc.Label", @@ -5281,11 +4985,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 224 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 228 + "__id__": 215 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5297,7 +5001,7 @@ "b": 255, "a": 255 }, - "_string": "火", + "_string": "土", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 30, @@ -5341,7 +5045,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "52oUTZtARKH5DF2j1bbhhz" + "fileId": "e5VXOv3bRM6q65VJDcEJ9f" }, { "__type__": "cc.PrefabInfo", @@ -5351,7 +5055,7 @@ "asset": { "__id__": 0 }, - "fileId": "a8cEIQ6fVFP7YWCYooTNeV", + "fileId": "93Bgw1DZdCZJmc2EpIJGUO", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5362,11 +5066,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 223 + "__id__": 210 }, "_enabled": true, "__prefab": { - "__id__": 231 + "__id__": 218 }, "_contentSize": { "__type__": "cc.Size", @@ -5382,7 +5086,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3dVnFLZIRNrLnkJOWC/o1j" + "fileId": "c0n2vQ8adFPqDFKRwciErF" }, { "__type__": "cc.Button", @@ -5390,11 +5094,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 223 + "__id__": 210 }, "_enabled": true, "__prefab": { - "__id__": 233 + "__id__": 220 }, "clickEvents": [], "_interactable": true, @@ -5413,50 +5117,215 @@ "b": 211, "a": 255 }, - "_pressedColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_normalSprite": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, + "_duration": 0.1, + "_zoomScale": 1.2, + "_target": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "24gz76CMtPxbd2+OL1iF6R" + }, + { + "__type__": "01072pOfZNI5LNG77/ogzuD", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 210 + }, + "_enabled": true, + "__prefab": { + "__id__": 222 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "09igXAvOJELZZ8QfALg6Al" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "90afr6Rf5Cqpz9hKaUHaF6", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 139 + }, + "_enabled": true, + "__prefab": { + "__id__": 225 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 600, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "99O8s63ypJjbmlO9OeRurk" + }, + { + "__type__": "cc.Layout", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 139 + }, + "_enabled": true, + "__prefab": { + "__id__": 227 + }, + "_resizeMode": 1, + "_layoutType": 1, + "_cellSize": { + "__type__": "cc.Size", + "width": 40, + "height": 40 + }, + "_startAxis": 0, + "_paddingLeft": 0, + "_paddingRight": 0, + "_paddingTop": 0, + "_paddingBottom": 0, + "_spacingX": 0, + "_spacingY": 0, + "_verticalDirection": 1, + "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, + "_affectedByScale": false, + "_isAlign": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "601yl2km1ElpjSh7C4PR7S" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "4bO3LA6wRDVbDxer8Z/ZCC", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 132 + }, + "_enabled": true, + "__prefab": { + "__id__": 230 }, - "_disabledColor": { - "__type__": "cc.Color", - "r": 124, - "g": 124, - "b": 124, - "a": 255 + "_contentSize": { + "__type__": "cc.Size", + "width": 600, + "height": 54 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 }, - "_normalSprite": null, - "_hoverSprite": null, - "_pressedSprite": null, - "_disabledSprite": null, - "_duration": 0.1, - "_zoomScale": 1.2, - "_target": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "69WY+4jlZHf4dYoWC5sqts" + "fileId": "a8WgDTVx5J/paQLsZdD6tS" }, { - "__type__": "01072pOfZNI5LNG77/ogzuD", + "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 223 + "__id__": 132 }, "_enabled": true, "__prefab": { - "__id__": 235 + "__id__": 232 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "92f29d0d-ccba-4079-a86f-7589e61dac59@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fcM8/A2JdCS5kfh9d6iNkf" + "fileId": "a9lo/M465AS7jJOPqmQZmj" }, { "__type__": "cc.PrefabInfo", @@ -5466,79 +5335,28 @@ "asset": { "__id__": 0 }, - "fileId": "f21UjeC1JMYJifKTvuzg5C", + "fileId": "8aWurWE8RIdowIfCHqL44r", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "btn5", + "_name": "btnFuse", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 166 + "__id__": 107 }, - "_children": [ - { - "__id__": 238 - } - ], + "_children": [], "_active": true, "_components": [ { - "__id__": 244 + "__id__": 235 }, { - "__id__": 246 + "__id__": 237 }, - { - "__id__": 248 - } - ], - "_prefab": { - "__id__": 250 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 250, - "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.Node", - "_name": "Label", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 237 - }, - "_children": [], - "_active": true, - "_components": [ { "__id__": 239 }, @@ -5552,7 +5370,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": -273.621, "z": 0 }, "_lrot": { @@ -5584,16 +5402,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 238 + "__id__": 234 }, "_enabled": true, "__prefab": { - "__id__": 240 + "__id__": 236 }, "_contentSize": { "__type__": "cc.Size", - "width": 34, - "height": 54.4 + "width": 286, + "height": 103 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5604,19 +5422,19 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "0bNoGbzKJO/pRTTFitG99E" + "fileId": "bbpxO9YQNGDb/ukO8bM89N" }, { - "__type__": "cc.Label", + "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 238 + "__id__": 234 }, "_enabled": true, "__prefab": { - "__id__": 242 + "__id__": 238 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5628,92 +5446,28 @@ "b": 255, "a": 255 }, - "_string": "土", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 30, - "_fontSize": 30, - "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 0, - "_enableWrapText": true, - "_font": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_isItalic": false, - "_isBold": true, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_enableOutline": true, - "_outlineColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_outlineWidth": 2, - "_enableShadow": false, - "_shadowColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_shadowOffset": { - "__type__": "cc.Vec2", - "x": 2, - "y": 2 - }, - "_shadowBlur": 2, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "e5VXOv3bRM6q65VJDcEJ9f" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "93Bgw1DZdCZJmc2EpIJGUO", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 237 - }, - "_enabled": true, - "__prefab": { - "__id__": 245 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 100 + "_spriteFrame": { + "__uuid__": "72758539-6ad4-4987-a1ee-da5d870106a6@f9941", + "__expectedType__": "cc.SpriteFrame" }, - "_anchorPoint": { + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 + "x": 0, + "y": 0 }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c0n2vQ8adFPqDFKRwciErF" + "fileId": "a6W1Uu05dFm5qSVHXLlIEs" }, { "__type__": "cc.Button", @@ -5721,15 +5475,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 237 + "__id__": 234 }, "_enabled": true, "__prefab": { - "__id__": 247 + "__id__": 240 }, "clickEvents": [], "_interactable": true, - "_transition": 0, + "_transition": 3, "_normalColor": { "__type__": "cc.Color", "r": 255, @@ -5769,7 +5523,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "24gz76CMtPxbd2+OL1iF6R" + "fileId": "ebqyy9DFdMDYrLTQZbXFEW" }, { "__type__": "01072pOfZNI5LNG77/ogzuD", @@ -5777,17 +5531,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 237 + "__id__": 234 }, "_enabled": true, "__prefab": { - "__id__": 249 + "__id__": 242 }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "09igXAvOJELZZ8QfALg6Al" + "fileId": "5f7E5UQotIN4MSVC4I5Kjc" }, { "__type__": "cc.PrefabInfo", @@ -5797,7 +5551,7 @@ "asset": { "__id__": 0 }, - "fileId": "90afr6Rf5Cqpz9hKaUHaF6", + "fileId": "3cUoZ5dMxF0qUZhXQfboTb", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5808,16 +5562,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 166 + "__id__": 107 }, "_enabled": true, "__prefab": { - "__id__": 252 + "__id__": 245 }, "_contentSize": { "__type__": "cc.Size", - "width": 600, - "height": 100 + "width": 757, + "height": 788 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5828,45 +5582,43 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "99O8s63ypJjbmlO9OeRurk" + "fileId": "f01L4w+aVJy4DCFZiWZ42L" }, { - "__type__": "cc.Layout", + "__type__": "cc.Widget", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 166 + "__id__": 107 }, "_enabled": true, "__prefab": { - "__id__": 254 - }, - "_resizeMode": 1, - "_layoutType": 1, - "_cellSize": { - "__type__": "cc.Size", - "width": 40, - "height": 40 + "__id__": 247 }, - "_startAxis": 0, - "_paddingLeft": 0, - "_paddingRight": 0, - "_paddingTop": 0, - "_paddingBottom": 0, - "_spacingX": 0, - "_spacingY": 0, - "_verticalDirection": 1, - "_horizontalDirection": 0, - "_constraint": 0, - "_constraintNum": 2, - "_affectedByScale": false, - "_isAlign": false, + "_alignFlags": 4, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": -34, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "601yl2km1ElpjSh7C4PR7S" + "fileId": "2dvP7hPEdEfIHlGJUYVSvv" }, { "__type__": "cc.PrefabInfo", @@ -5876,26 +5628,136 @@ "asset": { "__id__": 0 }, - "fileId": "4bO3LA6wRDVbDxer8Z/ZCC", + "fileId": "40ZjRiTrZBQI/I52RUhcKX", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "btnClose", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 14 + }, + "_children": [ + { + "__id__": 250 + }, + { + "__id__": 256 + } + ], + "_active": true, + "_components": [ + { + "__id__": 262 + }, + { + "__id__": 264 + }, + { + "__id__": 266 + } + ], + "_prefab": { + "__id__": 268 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -233.893, + "y": 698.284, + "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.Node", + "_name": "icon", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 249 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 251 + }, + { + "__id__": 253 + } + ], + "_prefab": { + "__id__": 255 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -99.749, + "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__": 159 + "__id__": 250 }, "_enabled": true, "__prefab": { - "__id__": 257 + "__id__": 252 }, "_contentSize": { "__type__": "cc.Size", - "width": 600, + "width": 64, "height": 54 }, "_anchorPoint": { @@ -5907,7 +5769,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a8WgDTVx5J/paQLsZdD6tS" + "fileId": "3am0E7gJxG6KEinkzCpt4M" }, { "__type__": "cc.Sprite", @@ -5915,11 +5777,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 159 + "__id__": 250 }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 254 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5932,12 +5794,12 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "92f29d0d-ccba-4079-a86f-7589e61dac59@f9941", + "__uuid__": "158044a5-4418-4a89-9a6f-68bf0cb58c53@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, - "_sizeMode": 0, + "_sizeMode": 1, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -5952,7 +5814,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a9lo/M465AS7jJOPqmQZmj" + "fileId": "2f91o1LxlCG7gAqJ/7Z0Zq" }, { "__type__": "cc.PrefabInfo", @@ -5962,42 +5824,36 @@ "asset": { "__id__": 0 }, - "fileId": "8aWurWE8RIdowIfCHqL44r", + "fileId": "9al0xZidlIIppKRsN5zSje", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "btnFuse", + "_name": "返回首页", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 14 + "__id__": 249 }, "_children": [], "_active": true, "_components": [ { - "__id__": 262 - }, - { - "__id__": 264 - }, - { - "__id__": 266 + "__id__": 257 }, { - "__id__": 268 + "__id__": 259 } ], "_prefab": { - "__id__": 270 + "__id__": 261 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": -660.111, + "x": 28.287, + "y": 0, "z": 0 }, "_lrot": { @@ -6029,16 +5885,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 261 + "__id__": 256 }, "_enabled": true, "__prefab": { - "__id__": 263 + "__id__": 258 }, "_contentSize": { "__type__": "cc.Size", - "width": 286, - "height": 103 + "width": 183, + "height": 48 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6049,7 +5905,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "bbpxO9YQNGDb/ukO8bM89N" + "fileId": "4drjfNNs9P2YKfMhYVayuq" }, { "__type__": "cc.Sprite", @@ -6057,11 +5913,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 261 + "__id__": 256 }, "_enabled": true, "__prefab": { - "__id__": 265 + "__id__": 260 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6074,7 +5930,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "72758539-6ad4-4987-a1ee-da5d870106a6@f9941", + "__uuid__": "979194e7-bb64-4549-9d9c-301c7c4e3d90@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -6094,7 +5950,48 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a6W1Uu05dFm5qSVHXLlIEs" + "fileId": "e67hI86ZxAS47IDRdLp1fZ" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "7cRzWQz+9PepbvhqMac6mD", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 249 + }, + "_enabled": true, + "__prefab": { + "__id__": 263 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 250, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "efHVbm50BJubO5S5I/bHlB" }, { "__type__": "cc.Button", @@ -6102,11 +5999,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 261 + "__id__": 249 }, "_enabled": true, "__prefab": { - "__id__": 267 + "__id__": 265 }, "clickEvents": [], "_interactable": true, @@ -6150,7 +6047,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ebqyy9DFdMDYrLTQZbXFEW" + "fileId": "6eIacPOqFMdZ5bh5srLZ9Q" }, { "__type__": "01072pOfZNI5LNG77/ogzuD", @@ -6158,17 +6055,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 261 + "__id__": 249 }, "_enabled": true, "__prefab": { - "__id__": 269 + "__id__": 267 }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5f7E5UQotIN4MSVC4I5Kjc" + "fileId": "ccyOaNJsRMiLsDlYQhD8BS" }, { "__type__": "cc.PrefabInfo", @@ -6178,7 +6075,7 @@ "asset": { "__id__": 0 }, - "fileId": "3cUoZ5dMxF0qUZhXQfboTb", + "fileId": "09ddntFHRD1a1MLlocXvPE", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -6193,7 +6090,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 272 + "__id__": 270 }, "_contentSize": { "__type__": "cc.Size", @@ -6221,7 +6118,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 274 + "__id__": 272 }, "_alignFlags": 45, "_target": null, @@ -6270,7 +6167,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 277 + "__id__": 275 }, "_contentSize": { "__type__": "cc.Size", @@ -6298,7 +6195,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 279 + "__id__": 277 }, "_alignFlags": 45, "_target": null, @@ -6334,7 +6231,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 281 + "__id__": 279 }, "_id": "" }, @@ -6355,7 +6252,7 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 146 + "__id__": 115 } ] } diff --git a/assets/bundles/gemstone/texture.meta b/assets/bundles/gemstone/texture.meta new file mode 100644 index 0000000..8a8c4ff --- /dev/null +++ b/assets/bundles/gemstone/texture.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "84cb23ea-479d-4820-8055-002bab05c359", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/bundles/gemstone/texture/title_1.png b/assets/bundles/gemstone/texture/title_1.png new file mode 100644 index 0000000..5107e00 Binary files /dev/null and b/assets/bundles/gemstone/texture/title_1.png differ diff --git a/assets/res/gemstone/texture/框-大-1.png.meta b/assets/bundles/gemstone/texture/title_1.png.meta similarity index 70% rename from assets/res/gemstone/texture/框-大-1.png.meta rename to assets/bundles/gemstone/texture/title_1.png.meta index 8c7dc22..578e336 100644 --- a/assets/res/gemstone/texture/框-大-1.png.meta +++ b/assets/bundles/gemstone/texture/title_1.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "b6edad92-1f5a-4c28-bfab-6bfd0fc41f82", + "uuid": "52de92ba-c49c-4b1b-8c71-c1f8e8e1b2f0", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "b6edad92-1f5a-4c28-bfab-6bfd0fc41f82@6c48a", - "displayName": "框-大-1", + "uuid": "52de92ba-c49c-4b1b-8c71-c1f8e8e1b2f0@6c48a", + "displayName": "title_1", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "b6edad92-1f5a-4c28-bfab-6bfd0fc41f82", + "imageUuidOrDatabaseUri": "52de92ba-c49c-4b1b-8c71-c1f8e8e1b2f0", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "b6edad92-1f5a-4c28-bfab-6bfd0fc41f82@f9941", - "displayName": "框-大-1", + "uuid": "52de92ba-c49c-4b1b-8c71-c1f8e8e1b2f0@f9941", + "displayName": "title_1", "id": "f9941", "name": "spriteFrame", "userData": { @@ -45,10 +45,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 101, - "height": 101, - "rawWidth": 101, - "rawHeight": 101, + "width": 721, + "height": 310, + "rawWidth": 721, + "rawHeight": 310, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -50.5, - -50.5, + -360.5, + -155, 0, - 50.5, - -50.5, + 360.5, + -155, 0, - -50.5, - 50.5, + -360.5, + 155, 0, - 50.5, - 50.5, + 360.5, + 155, 0 ], "indexes": [ @@ -83,12 +83,12 @@ ], "uv": [ 0, - 101, - 101, - 101, + 310, + 721, + 310, 0, 0, - 101, + 721, 0 ], "nuv": [ @@ -102,18 +102,18 @@ 1 ], "minPos": [ - -50.5, - -50.5, + -360.5, + -155, 0 ], "maxPos": [ - 50.5, - 50.5, + 360.5, + 155, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "b6edad92-1f5a-4c28-bfab-6bfd0fc41f82@6c48a", + "imageUuidOrDatabaseUri": "52de92ba-c49c-4b1b-8c71-c1f8e8e1b2f0@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "b6edad92-1f5a-4c28-bfab-6bfd0fc41f82@6c48a" + "redirect": "52de92ba-c49c-4b1b-8c71-c1f8e8e1b2f0@6c48a" } } diff --git a/assets/bundles/gemstone/texture/title_2.png b/assets/bundles/gemstone/texture/title_2.png new file mode 100644 index 0000000..d039b93 Binary files /dev/null and b/assets/bundles/gemstone/texture/title_2.png differ diff --git a/assets/res/gemstone/texture/框-大-4.png.meta b/assets/bundles/gemstone/texture/title_2.png.meta similarity index 70% rename from assets/res/gemstone/texture/框-大-4.png.meta rename to assets/bundles/gemstone/texture/title_2.png.meta index 4a16ba9..0c98dcc 100644 --- a/assets/res/gemstone/texture/框-大-4.png.meta +++ b/assets/bundles/gemstone/texture/title_2.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "9b0a3bb5-7dcf-44a6-a728-3666c6b53df9", + "uuid": "71272255-b3e7-4e61-bf47-204f6ffe5c0e", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "9b0a3bb5-7dcf-44a6-a728-3666c6b53df9@6c48a", - "displayName": "框-大-4", + "uuid": "71272255-b3e7-4e61-bf47-204f6ffe5c0e@6c48a", + "displayName": "title_2", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "9b0a3bb5-7dcf-44a6-a728-3666c6b53df9", + "imageUuidOrDatabaseUri": "71272255-b3e7-4e61-bf47-204f6ffe5c0e", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "9b0a3bb5-7dcf-44a6-a728-3666c6b53df9@f9941", - "displayName": "框-大-4", + "uuid": "71272255-b3e7-4e61-bf47-204f6ffe5c0e@f9941", + "displayName": "title_2", "id": "f9941", "name": "spriteFrame", "userData": { @@ -45,10 +45,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 101, - "height": 101, - "rawWidth": 101, - "rawHeight": 101, + "width": 721, + "height": 310, + "rawWidth": 721, + "rawHeight": 310, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -50.5, - -50.5, + -360.5, + -155, 0, - 50.5, - -50.5, + 360.5, + -155, 0, - -50.5, - 50.5, + -360.5, + 155, 0, - 50.5, - 50.5, + 360.5, + 155, 0 ], "indexes": [ @@ -83,12 +83,12 @@ ], "uv": [ 0, - 101, - 101, - 101, + 310, + 721, + 310, 0, 0, - 101, + 721, 0 ], "nuv": [ @@ -102,18 +102,18 @@ 1 ], "minPos": [ - -50.5, - -50.5, + -360.5, + -155, 0 ], "maxPos": [ - 50.5, - 50.5, + 360.5, + 155, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "9b0a3bb5-7dcf-44a6-a728-3666c6b53df9@6c48a", + "imageUuidOrDatabaseUri": "71272255-b3e7-4e61-bf47-204f6ffe5c0e@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "9b0a3bb5-7dcf-44a6-a728-3666c6b53df9@6c48a" + "redirect": "71272255-b3e7-4e61-bf47-204f6ffe5c0e@6c48a" } } diff --git a/assets/bundles/gemstone/texture/title_3.png b/assets/bundles/gemstone/texture/title_3.png new file mode 100644 index 0000000..a8bbf4c Binary files /dev/null and b/assets/bundles/gemstone/texture/title_3.png differ diff --git a/assets/res/gemstone/texture/框-大-3.png.meta b/assets/bundles/gemstone/texture/title_3.png.meta similarity index 70% rename from assets/res/gemstone/texture/框-大-3.png.meta rename to assets/bundles/gemstone/texture/title_3.png.meta index 8461d30..dc0176c 100644 --- a/assets/res/gemstone/texture/框-大-3.png.meta +++ b/assets/bundles/gemstone/texture/title_3.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "762ec992-0f1b-426e-a4b8-654148268803", + "uuid": "96192954-7607-4805-801a-275f51feed90", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "762ec992-0f1b-426e-a4b8-654148268803@6c48a", - "displayName": "框-大-3", + "uuid": "96192954-7607-4805-801a-275f51feed90@6c48a", + "displayName": "title_3", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "762ec992-0f1b-426e-a4b8-654148268803", + "imageUuidOrDatabaseUri": "96192954-7607-4805-801a-275f51feed90", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "762ec992-0f1b-426e-a4b8-654148268803@f9941", - "displayName": "框-大-3", + "uuid": "96192954-7607-4805-801a-275f51feed90@f9941", + "displayName": "title_3", "id": "f9941", "name": "spriteFrame", "userData": { @@ -45,10 +45,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 101, - "height": 101, - "rawWidth": 101, - "rawHeight": 101, + "width": 721, + "height": 310, + "rawWidth": 721, + "rawHeight": 310, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -50.5, - -50.5, + -360.5, + -155, 0, - 50.5, - -50.5, + 360.5, + -155, 0, - -50.5, - 50.5, + -360.5, + 155, 0, - 50.5, - 50.5, + 360.5, + 155, 0 ], "indexes": [ @@ -83,12 +83,12 @@ ], "uv": [ 0, - 101, - 101, - 101, + 310, + 721, + 310, 0, 0, - 101, + 721, 0 ], "nuv": [ @@ -102,18 +102,18 @@ 1 ], "minPos": [ - -50.5, - -50.5, + -360.5, + -155, 0 ], "maxPos": [ - 50.5, - 50.5, + 360.5, + 155, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "762ec992-0f1b-426e-a4b8-654148268803@6c48a", + "imageUuidOrDatabaseUri": "96192954-7607-4805-801a-275f51feed90@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "762ec992-0f1b-426e-a4b8-654148268803@6c48a" + "redirect": "96192954-7607-4805-801a-275f51feed90@6c48a" } } diff --git a/assets/bundles/gemstone/texture/title_4.png b/assets/bundles/gemstone/texture/title_4.png new file mode 100644 index 0000000..5a9abb3 Binary files /dev/null and b/assets/bundles/gemstone/texture/title_4.png differ diff --git a/assets/bundles/gemstone/texture/title_4.png.meta b/assets/bundles/gemstone/texture/title_4.png.meta new file mode 100644 index 0000000..738ffde --- /dev/null +++ b/assets/bundles/gemstone/texture/title_4.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "bdc4dabb-4dfa-4d23-a822-ea98dedd2dcf", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "bdc4dabb-4dfa-4d23-a822-ea98dedd2dcf@6c48a", + "displayName": "title_4", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "bdc4dabb-4dfa-4d23-a822-ea98dedd2dcf", + "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": "bdc4dabb-4dfa-4d23-a822-ea98dedd2dcf@f9941", + "displayName": "title_4", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 721, + "height": 310, + "rawWidth": 721, + "rawHeight": 310, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -360.5, + -155, + 0, + 360.5, + -155, + 0, + -360.5, + 155, + 0, + 360.5, + 155, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 310, + 721, + 310, + 0, + 0, + 721, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -360.5, + -155, + 0 + ], + "maxPos": [ + 360.5, + 155, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "bdc4dabb-4dfa-4d23-a822-ea98dedd2dcf@6c48a", + "atlasUuid": "", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "redirect": "bdc4dabb-4dfa-4d23-a822-ea98dedd2dcf@6c48a" + } +} diff --git a/assets/bundles/gemstone/texture/title_5.png b/assets/bundles/gemstone/texture/title_5.png new file mode 100644 index 0000000..581c316 Binary files /dev/null and b/assets/bundles/gemstone/texture/title_5.png differ diff --git a/assets/bundles/gemstone/texture/title_5.png.meta b/assets/bundles/gemstone/texture/title_5.png.meta new file mode 100644 index 0000000..fd9645a --- /dev/null +++ b/assets/bundles/gemstone/texture/title_5.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "5d5ffafd-c884-4f6e-af21-f6dc874e669d", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "5d5ffafd-c884-4f6e-af21-f6dc874e669d@6c48a", + "displayName": "title_5", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "5d5ffafd-c884-4f6e-af21-f6dc874e669d", + "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": "5d5ffafd-c884-4f6e-af21-f6dc874e669d@f9941", + "displayName": "title_5", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 721, + "height": 310, + "rawWidth": 721, + "rawHeight": 310, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -360.5, + -155, + 0, + 360.5, + -155, + 0, + -360.5, + 155, + 0, + 360.5, + 155, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 310, + 721, + 310, + 0, + 0, + 721, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -360.5, + -155, + 0 + ], + "maxPos": [ + 360.5, + 155, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "5d5ffafd-c884-4f6e-af21-f6dc874e669d@6c48a", + "atlasUuid": "", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "redirect": "5d5ffafd-c884-4f6e-af21-f6dc874e669d@6c48a" + } +} diff --git a/assets/bundles/icons/weapon/冰锥1.png b/assets/bundles/icons/weapon/冰锥1.png index 99ff08a..6706289 100644 Binary files a/assets/bundles/icons/weapon/冰锥1.png and b/assets/bundles/icons/weapon/冰锥1.png differ diff --git a/assets/bundles/icons/weapon/冰锥1.png.meta b/assets/bundles/icons/weapon/冰锥1.png.meta index aee19ca..e3c06b6 100644 --- a/assets/bundles/icons/weapon/冰锥1.png.meta +++ b/assets/bundles/icons/weapon/冰锥1.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -0.5, "offsetY": 0.5, - "trimX": 24, - "trimY": 32, - "width": 152, - "height": 135, + "trimX": 30, + "trimY": 43, + "width": 139, + "height": 113, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -76, - -67.5, + -69.5, + -56.5, 0, - 76, - -67.5, + 69.5, + -56.5, 0, - -76, - 67.5, + -69.5, + 56.5, 0, - 76, - 67.5, + 69.5, + 56.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 24, - 168, - 176, - 168, - 24, - 33, - 176, - 33 + 30, + 157, + 169, + 157, + 30, + 44, + 169, + 44 ], "nuv": [ - 0.12, - 0.165, - 0.88, - 0.165, - 0.12, - 0.84, - 0.88, - 0.84 + 0.15, + 0.22, + 0.845, + 0.22, + 0.15, + 0.785, + 0.845, + 0.785 ], "minPos": [ - -76, - -67.5, + -69.5, + -56.5, 0 ], "maxPos": [ - 76, - 67.5, + 69.5, + 56.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/冰锥2.png b/assets/bundles/icons/weapon/冰锥2.png index e522273..6f6d031 100644 Binary files a/assets/bundles/icons/weapon/冰锥2.png and b/assets/bundles/icons/weapon/冰锥2.png differ diff --git a/assets/bundles/icons/weapon/冰锥2.png.meta b/assets/bundles/icons/weapon/冰锥2.png.meta index 2bbd88a..76a09a5 100644 --- a/assets/bundles/icons/weapon/冰锥2.png.meta +++ b/assets/bundles/icons/weapon/冰锥2.png.meta @@ -42,11 +42,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, - "trimX": 22, - "trimY": 27, - "width": 156, - "height": 146, + "offsetY": 0.5, + "trimX": 30, + "trimY": 37, + "width": 140, + "height": 125, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -78, - -73, + -70, + -62.5, 0, - 78, - -73, + 70, + -62.5, 0, - -78, - 73, + -70, + 62.5, 0, - 78, - 73, + 70, + 62.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 22, - 173, - 178, - 173, - 22, - 27, - 178, - 27 + 30, + 163, + 170, + 163, + 30, + 38, + 170, + 38 ], "nuv": [ - 0.11, - 0.135, - 0.89, - 0.135, - 0.11, - 0.865, - 0.89, - 0.865 + 0.15, + 0.19, + 0.85, + 0.19, + 0.15, + 0.815, + 0.85, + 0.815 ], "minPos": [ - -78, - -73, + -70, + -62.5, 0 ], "maxPos": [ - 78, - 73, + 70, + 62.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/冰锥3.png b/assets/bundles/icons/weapon/冰锥3.png index dcbde5b..4d6d78b 100644 Binary files a/assets/bundles/icons/weapon/冰锥3.png and b/assets/bundles/icons/weapon/冰锥3.png differ diff --git a/assets/bundles/icons/weapon/冰锥3.png.meta b/assets/bundles/icons/weapon/冰锥3.png.meta index a53dd92..812f2ed 100644 --- a/assets/bundles/icons/weapon/冰锥3.png.meta +++ b/assets/bundles/icons/weapon/冰锥3.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0, + "offsetX": -0.5, + "offsetY": 0.5, "trimX": 19, - "trimY": 26, - "width": 162, - "height": 148, + "trimY": 25, + "width": 161, + "height": 149, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -81, - -74, + -80.5, + -74.5, 0, - 81, - -74, + 80.5, + -74.5, 0, - -81, - 74, + -80.5, + 74.5, 0, - 81, - 74, + 80.5, + 74.5, 0 ], "indexes": [ @@ -83,32 +83,32 @@ ], "uv": [ 19, - 174, - 181, - 174, + 175, + 180, + 175, 19, 26, - 181, + 180, 26 ], "nuv": [ 0.095, 0.13, - 0.905, + 0.9, 0.13, 0.095, - 0.87, - 0.905, - 0.87 + 0.875, + 0.9, + 0.875 ], "minPos": [ - -81, - -74, + -80.5, + -74.5, 0 ], "maxPos": [ - 81, - 74, + 80.5, + 74.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/冰锥4.png b/assets/bundles/icons/weapon/冰锥4.png index 6d54ac5..52c49e5 100644 Binary files a/assets/bundles/icons/weapon/冰锥4.png and b/assets/bundles/icons/weapon/冰锥4.png differ diff --git a/assets/bundles/icons/weapon/冰锥4.png.meta b/assets/bundles/icons/weapon/冰锥4.png.meta index 357506c..326aaa2 100644 --- a/assets/bundles/icons/weapon/冰锥4.png.meta +++ b/assets/bundles/icons/weapon/冰锥4.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -0.5, "offsetY": 0.5, - "trimX": 7, - "trimY": 22, - "width": 186, - "height": 155, + "trimX": 19, + "trimY": 25, + "width": 161, + "height": 149, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -93, - -77.5, + -80.5, + -74.5, 0, - 93, - -77.5, + 80.5, + -74.5, 0, - -93, - 77.5, + -80.5, + 74.5, 0, - 93, - 77.5, + 80.5, + 74.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 7, - 178, - 193, - 178, - 7, - 23, - 193, - 23 + 19, + 175, + 180, + 175, + 19, + 26, + 180, + 26 ], "nuv": [ - 0.035, - 0.115, - 0.965, - 0.115, - 0.035, - 0.89, - 0.965, - 0.89 + 0.095, + 0.13, + 0.9, + 0.13, + 0.095, + 0.875, + 0.9, + 0.875 ], "minPos": [ - -93, - -77.5, + -80.5, + -74.5, 0 ], "maxPos": [ - 93, - 77.5, + 80.5, + 74.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/冰锥5.png b/assets/bundles/icons/weapon/冰锥5.png index e04fa7f..396de94 100644 Binary files a/assets/bundles/icons/weapon/冰锥5.png and b/assets/bundles/icons/weapon/冰锥5.png differ diff --git a/assets/bundles/icons/weapon/冰锥5.png.meta b/assets/bundles/icons/weapon/冰锥5.png.meta index 25f7a07..45bd121 100644 --- a/assets/bundles/icons/weapon/冰锥5.png.meta +++ b/assets/bundles/icons/weapon/冰锥5.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -0.5, "offsetY": 0, - "trimX": 2, - "trimY": 23, - "width": 196, - "height": 154, + "trimX": 22, + "trimY": 25, + "width": 155, + "height": 150, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -98, - -77, + -77.5, + -75, 0, - 98, - -77, + 77.5, + -75, 0, - -98, - 77, + -77.5, + 75, 0, - 98, - 77, + 77.5, + 75, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 2, + 22, + 175, 177, - 198, + 175, + 22, + 25, 177, - 2, - 23, - 198, - 23 + 25 ], "nuv": [ - 0.01, - 0.115, - 0.99, - 0.115, - 0.01, + 0.11, + 0.125, + 0.885, + 0.125, + 0.11, + 0.875, 0.885, - 0.99, - 0.885 + 0.875 ], "minPos": [ - -98, - -77, + -77.5, + -75, 0 ], "maxPos": [ - 98, - 77, + 77.5, + 75, 0 ] }, diff --git a/assets/bundles/icons/weapon/冲锋2.png b/assets/bundles/icons/weapon/冲锋2.png index 1084261..9411900 100644 Binary files a/assets/bundles/icons/weapon/冲锋2.png and b/assets/bundles/icons/weapon/冲锋2.png differ diff --git a/assets/bundles/icons/weapon/冲锋2.png.meta b/assets/bundles/icons/weapon/冲锋2.png.meta index 7949554..71e76a4 100644 --- a/assets/bundles/icons/weapon/冲锋2.png.meta +++ b/assets/bundles/icons/weapon/冲锋2.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 24, - "trimY": 30, - "width": 152, - "height": 140, + "offsetX": -0.5, + "offsetY": 0.5, + "trimX": 23, + "trimY": 20, + "width": 153, + "height": 159, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -76, - -70, + -76.5, + -79.5, 0, - 76, - -70, + 76.5, + -79.5, 0, - -76, - 70, + -76.5, + 79.5, 0, - 76, - 70, + 76.5, + 79.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 24, - 170, + 23, + 180, 176, - 170, - 24, - 30, + 180, + 23, + 21, 176, - 30 + 21 ], "nuv": [ - 0.12, - 0.15, + 0.115, + 0.105, 0.88, - 0.15, - 0.12, - 0.85, + 0.105, + 0.115, + 0.9, 0.88, - 0.85 + 0.9 ], "minPos": [ - -76, - -70, + -76.5, + -79.5, 0 ], "maxPos": [ - 76, - 70, + 76.5, + 79.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/冲锋3.png b/assets/bundles/icons/weapon/冲锋3.png index 9e83c59..048cf9e 100644 Binary files a/assets/bundles/icons/weapon/冲锋3.png and b/assets/bundles/icons/weapon/冲锋3.png differ diff --git a/assets/bundles/icons/weapon/冲锋3.png.meta b/assets/bundles/icons/weapon/冲锋3.png.meta index 96cbc9c..a7005f6 100644 --- a/assets/bundles/icons/weapon/冲锋3.png.meta +++ b/assets/bundles/icons/weapon/冲锋3.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -0.5, "offsetY": 0.5, - "trimX": 26, - "trimY": 20, - "width": 148, - "height": 159, + "trimX": 18, + "trimY": 19, + "width": 163, + "height": 161, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -74, - -79.5, + -81.5, + -80.5, 0, - 74, - -79.5, + 81.5, + -80.5, 0, - -74, - 79.5, + -81.5, + 80.5, 0, - 74, - 79.5, + 81.5, + 80.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 26, - 180, - 174, - 180, - 26, - 21, - 174, - 21 + 18, + 181, + 181, + 181, + 18, + 20, + 181, + 20 ], "nuv": [ - 0.13, - 0.105, - 0.87, - 0.105, - 0.13, - 0.9, - 0.87, - 0.9 + 0.09, + 0.1, + 0.905, + 0.1, + 0.09, + 0.905, + 0.905, + 0.905 ], "minPos": [ - -74, - -79.5, + -81.5, + -80.5, 0 ], "maxPos": [ - 74, - 79.5, + 81.5, + 80.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/冲锋4.png b/assets/bundles/icons/weapon/冲锋4.png index 0dd8111..ee765a5 100644 Binary files a/assets/bundles/icons/weapon/冲锋4.png and b/assets/bundles/icons/weapon/冲锋4.png differ diff --git a/assets/bundles/icons/weapon/冲锋4.png.meta b/assets/bundles/icons/weapon/冲锋4.png.meta index 0bf4293..d14eae8 100644 --- a/assets/bundles/icons/weapon/冲锋4.png.meta +++ b/assets/bundles/icons/weapon/冲锋4.png.meta @@ -43,10 +43,10 @@ "rotated": false, "offsetX": -0.5, "offsetY": 0, - "trimX": 16, - "trimY": 25, - "width": 167, - "height": 150, + "trimX": 23, + "trimY": 18, + "width": 153, + "height": 164, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -83.5, - -75, + -76.5, + -82, 0, - 83.5, - -75, + 76.5, + -82, 0, - -83.5, - 75, + -76.5, + 82, 0, - 83.5, - 75, + 76.5, + 82, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 16, - 175, - 183, - 175, - 16, - 25, - 183, - 25 + 23, + 182, + 176, + 182, + 23, + 18, + 176, + 18 ], "nuv": [ - 0.08, - 0.125, - 0.915, - 0.125, - 0.08, - 0.875, - 0.915, - 0.875 + 0.115, + 0.09, + 0.88, + 0.09, + 0.115, + 0.91, + 0.88, + 0.91 ], "minPos": [ - -83.5, - -75, + -76.5, + -82, 0 ], "maxPos": [ - 83.5, - 75, + 76.5, + 82, 0 ] }, diff --git a/assets/bundles/icons/weapon/冲锋5.png b/assets/bundles/icons/weapon/冲锋5.png index ad343c5..e8c96c5 100644 Binary files a/assets/bundles/icons/weapon/冲锋5.png and b/assets/bundles/icons/weapon/冲锋5.png differ diff --git a/assets/bundles/icons/weapon/冲锋5.png.meta b/assets/bundles/icons/weapon/冲锋5.png.meta index d28e4c9..2c331f5 100644 --- a/assets/bundles/icons/weapon/冲锋5.png.meta +++ b/assets/bundles/icons/weapon/冲锋5.png.meta @@ -42,11 +42,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": -0.5, - "offsetY": 0.5, - "trimX": 17, - "trimY": 20, - "width": 165, - "height": 159, + "offsetY": 0, + "trimX": 18, + "trimY": 17, + "width": 163, + "height": 166, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -82.5, - -79.5, + -81.5, + -83, 0, - 82.5, - -79.5, + 81.5, + -83, 0, - -82.5, - 79.5, + -81.5, + 83, 0, - 82.5, - 79.5, + 81.5, + 83, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ + 18, + 183, + 181, + 183, + 18, 17, - 180, - 182, - 180, - 17, - 21, - 182, - 21 + 181, + 17 ], "nuv": [ + 0.09, 0.085, - 0.105, - 0.91, - 0.105, + 0.905, 0.085, - 0.9, - 0.91, - 0.9 + 0.09, + 0.915, + 0.905, + 0.915 ], "minPos": [ - -82.5, - -79.5, + -81.5, + -83, 0 ], "maxPos": [ - 82.5, - 79.5, + 81.5, + 83, 0 ] }, diff --git a/assets/bundles/icons/weapon/分裂弹2.png b/assets/bundles/icons/weapon/分裂弹2.png index d2998ed..b5e2411 100644 Binary files a/assets/bundles/icons/weapon/分裂弹2.png and b/assets/bundles/icons/weapon/分裂弹2.png differ diff --git a/assets/bundles/icons/weapon/分裂弹2.png.meta b/assets/bundles/icons/weapon/分裂弹2.png.meta index 5bbc5d5..b84d5d0 100644 --- a/assets/bundles/icons/weapon/分裂弹2.png.meta +++ b/assets/bundles/icons/weapon/分裂弹2.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "128a61cd-cbcf-4fe4-bd7a-4dda3ec18189", + "uuid": "cbd228e4-e3ce-474b-a141-bb380df2f2b6", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "128a61cd-cbcf-4fe4-bd7a-4dda3ec18189@6c48a", + "uuid": "cbd228e4-e3ce-474b-a141-bb380df2f2b6@6c48a", "displayName": "分裂弹2", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "128a61cd-cbcf-4fe4-bd7a-4dda3ec18189", + "imageUuidOrDatabaseUri": "cbd228e4-e3ce-474b-a141-bb380df2f2b6", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,19 +34,19 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "128a61cd-cbcf-4fe4-bd7a-4dda3ec18189@f9941", + "uuid": "cbd228e4-e3ce-474b-a141-bb380df2f2b6@f9941", "displayName": "分裂弹2", "id": "f9941", "name": "spriteFrame", "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 22, - "trimY": 27, - "width": 156, - "height": 146, + "offsetX": -0.5, + "offsetY": 0.5, + "trimX": 37, + "trimY": 21, + "width": 125, + "height": 157, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -78, - -73, + -62.5, + -78.5, 0, - 78, - -73, + 62.5, + -78.5, 0, - -78, - 73, + -62.5, + 78.5, 0, - 78, - 73, + 62.5, + 78.5, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ + 37, + 179, + 162, + 179, + 37, 22, - 173, - 178, - 173, - 22, - 27, - 178, - 27 + 162, + 22 ], "nuv": [ + 0.185, 0.11, - 0.135, - 0.89, - 0.135, + 0.81, 0.11, - 0.865, - 0.89, - 0.865 + 0.185, + 0.895, + 0.81, + 0.895 ], "minPos": [ - -78, - -73, + -62.5, + -78.5, 0 ], "maxPos": [ - 78, - 73, + 62.5, + 78.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "128a61cd-cbcf-4fe4-bd7a-4dda3ec18189@6c48a", + "imageUuidOrDatabaseUri": "cbd228e4-e3ce-474b-a141-bb380df2f2b6@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "128a61cd-cbcf-4fe4-bd7a-4dda3ec18189@6c48a" + "redirect": "cbd228e4-e3ce-474b-a141-bb380df2f2b6@6c48a" } } diff --git a/assets/bundles/icons/weapon/分裂弹3.png b/assets/bundles/icons/weapon/分裂弹3.png index a5d6df0..de3bcb3 100644 Binary files a/assets/bundles/icons/weapon/分裂弹3.png and b/assets/bundles/icons/weapon/分裂弹3.png differ diff --git a/assets/bundles/icons/weapon/分裂弹3.png.meta b/assets/bundles/icons/weapon/分裂弹3.png.meta index ff42320..2077330 100644 --- a/assets/bundles/icons/weapon/分裂弹3.png.meta +++ b/assets/bundles/icons/weapon/分裂弹3.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "2318a2db-9281-48f3-82cf-ff3f3712f0c0", + "uuid": "ab303fb9-21c7-43d1-bbf7-10794d227459", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "2318a2db-9281-48f3-82cf-ff3f3712f0c0@6c48a", + "uuid": "ab303fb9-21c7-43d1-bbf7-10794d227459@6c48a", "displayName": "分裂弹3", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "2318a2db-9281-48f3-82cf-ff3f3712f0c0", + "imageUuidOrDatabaseUri": "ab303fb9-21c7-43d1-bbf7-10794d227459", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,7 +34,7 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "2318a2db-9281-48f3-82cf-ff3f3712f0c0@f9941", + "uuid": "ab303fb9-21c7-43d1-bbf7-10794d227459@f9941", "displayName": "分裂弹3", "id": "f9941", "name": "spriteFrame", @@ -42,11 +42,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, - "trimX": 19, - "trimY": 26, - "width": 162, - "height": 148, + "offsetY": 0.5, + "trimX": 35, + "trimY": 22, + "width": 130, + "height": 155, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -81, - -74, + -65, + -77.5, 0, - 81, - -74, + 65, + -77.5, 0, - -81, - 74, + -65, + 77.5, 0, - 81, - 74, + 65, + 77.5, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 19, - 174, - 181, - 174, - 19, - 26, - 181, - 26 + 35, + 178, + 165, + 178, + 35, + 23, + 165, + 23 ], "nuv": [ - 0.095, - 0.13, - 0.905, - 0.13, - 0.095, - 0.87, - 0.905, - 0.87 + 0.175, + 0.115, + 0.825, + 0.115, + 0.175, + 0.89, + 0.825, + 0.89 ], "minPos": [ - -81, - -74, + -65, + -77.5, 0 ], "maxPos": [ - 81, - 74, + 65, + 77.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "2318a2db-9281-48f3-82cf-ff3f3712f0c0@6c48a", + "imageUuidOrDatabaseUri": "ab303fb9-21c7-43d1-bbf7-10794d227459@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "2318a2db-9281-48f3-82cf-ff3f3712f0c0@6c48a" + "redirect": "ab303fb9-21c7-43d1-bbf7-10794d227459@6c48a" } } diff --git a/assets/bundles/icons/weapon/分裂弹4.png b/assets/bundles/icons/weapon/分裂弹4.png index 86889ac..ebad967 100644 Binary files a/assets/bundles/icons/weapon/分裂弹4.png and b/assets/bundles/icons/weapon/分裂弹4.png differ diff --git a/assets/bundles/icons/weapon/分裂弹4.png.meta b/assets/bundles/icons/weapon/分裂弹4.png.meta index 5b46d22..a921bf5 100644 --- a/assets/bundles/icons/weapon/分裂弹4.png.meta +++ b/assets/bundles/icons/weapon/分裂弹4.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "7765d695-899d-4bf3-bcaa-a68c89d2dcbe", + "uuid": "66d51049-2daa-401d-a160-7b440d2f6257", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "7765d695-899d-4bf3-bcaa-a68c89d2dcbe@6c48a", + "uuid": "66d51049-2daa-401d-a160-7b440d2f6257@6c48a", "displayName": "分裂弹4", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "7765d695-899d-4bf3-bcaa-a68c89d2dcbe", + "imageUuidOrDatabaseUri": "66d51049-2daa-401d-a160-7b440d2f6257", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,19 +34,19 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "7765d695-899d-4bf3-bcaa-a68c89d2dcbe@f9941", + "uuid": "66d51049-2daa-401d-a160-7b440d2f6257@f9941", "displayName": "分裂弹4", "id": "f9941", "name": "spriteFrame", "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -0.5, "offsetY": 0.5, - "trimX": 7, - "trimY": 22, - "width": 186, - "height": 155, + "trimX": 34, + "trimY": 17, + "width": 131, + "height": 165, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -93, - -77.5, + -65.5, + -82.5, 0, - 93, - -77.5, + 65.5, + -82.5, 0, - -93, - 77.5, + -65.5, + 82.5, 0, - 93, - 77.5, + 65.5, + 82.5, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 7, - 178, - 193, - 178, - 7, - 23, - 193, - 23 + 34, + 183, + 165, + 183, + 34, + 18, + 165, + 18 ], "nuv": [ - 0.035, - 0.115, - 0.965, - 0.115, - 0.035, - 0.89, - 0.965, - 0.89 + 0.17, + 0.09, + 0.825, + 0.09, + 0.17, + 0.915, + 0.825, + 0.915 ], "minPos": [ - -93, - -77.5, + -65.5, + -82.5, 0 ], "maxPos": [ - 93, - 77.5, + 65.5, + 82.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "7765d695-899d-4bf3-bcaa-a68c89d2dcbe@6c48a", + "imageUuidOrDatabaseUri": "66d51049-2daa-401d-a160-7b440d2f6257@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "7765d695-899d-4bf3-bcaa-a68c89d2dcbe@6c48a" + "redirect": "66d51049-2daa-401d-a160-7b440d2f6257@6c48a" } } diff --git a/assets/bundles/icons/weapon/分裂弹5.png b/assets/bundles/icons/weapon/分裂弹5.png index e901f68..397f93d 100644 Binary files a/assets/bundles/icons/weapon/分裂弹5.png and b/assets/bundles/icons/weapon/分裂弹5.png differ diff --git a/assets/bundles/icons/weapon/分裂弹5.png.meta b/assets/bundles/icons/weapon/分裂弹5.png.meta index 320154c..cfcc28b 100644 --- a/assets/bundles/icons/weapon/分裂弹5.png.meta +++ b/assets/bundles/icons/weapon/分裂弹5.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "bcc7e88e-5751-4e3a-8938-b92e97deccfa", + "uuid": "e77a6aed-c7c3-437b-92d9-cd79c2fe1cdb", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "bcc7e88e-5751-4e3a-8938-b92e97deccfa@6c48a", + "uuid": "e77a6aed-c7c3-437b-92d9-cd79c2fe1cdb@6c48a", "displayName": "分裂弹5", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "bcc7e88e-5751-4e3a-8938-b92e97deccfa", + "imageUuidOrDatabaseUri": "e77a6aed-c7c3-437b-92d9-cd79c2fe1cdb", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,19 +34,19 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "bcc7e88e-5751-4e3a-8938-b92e97deccfa@f9941", + "uuid": "e77a6aed-c7c3-437b-92d9-cd79c2fe1cdb@f9941", "displayName": "分裂弹5", "id": "f9941", "name": "spriteFrame", "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 2, - "trimY": 23, - "width": 196, - "height": 154, + "offsetX": -0.5, + "offsetY": 0.5, + "trimX": 28, + "trimY": 17, + "width": 143, + "height": 165, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -98, - -77, + -71.5, + -82.5, 0, - 98, - -77, + 71.5, + -82.5, 0, - -98, - 77, + -71.5, + 82.5, 0, - 98, - 77, + 71.5, + 82.5, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 2, - 177, - 198, - 177, - 2, - 23, - 198, - 23 + 28, + 183, + 171, + 183, + 28, + 18, + 171, + 18 ], "nuv": [ - 0.01, - 0.115, - 0.99, - 0.115, - 0.01, - 0.885, - 0.99, - 0.885 + 0.14, + 0.09, + 0.855, + 0.09, + 0.14, + 0.915, + 0.855, + 0.915 ], "minPos": [ - -98, - -77, + -71.5, + -82.5, 0 ], "maxPos": [ - 98, - 77, + 71.5, + 82.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "bcc7e88e-5751-4e3a-8938-b92e97deccfa@6c48a", + "imageUuidOrDatabaseUri": "e77a6aed-c7c3-437b-92d9-cd79c2fe1cdb@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "bcc7e88e-5751-4e3a-8938-b92e97deccfa@6c48a" + "redirect": "e77a6aed-c7c3-437b-92d9-cd79c2fe1cdb@6c48a" } } diff --git a/assets/bundles/icons/weapon/剑气2.png b/assets/bundles/icons/weapon/剑气2.png index 6991982..0430d74 100644 Binary files a/assets/bundles/icons/weapon/剑气2.png and b/assets/bundles/icons/weapon/剑气2.png differ diff --git a/assets/bundles/icons/weapon/剑气2.png.meta b/assets/bundles/icons/weapon/剑气2.png.meta index 3bfc373..1376e90 100644 --- a/assets/bundles/icons/weapon/剑气2.png.meta +++ b/assets/bundles/icons/weapon/剑气2.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "9bc11e4e-1a12-4875-8397-2e1f4b62d7ee", + "uuid": "95cddba3-d043-4c8e-acb4-58ea8689e874", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "9bc11e4e-1a12-4875-8397-2e1f4b62d7ee@6c48a", + "uuid": "95cddba3-d043-4c8e-acb4-58ea8689e874@6c48a", "displayName": "剑气2", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "9bc11e4e-1a12-4875-8397-2e1f4b62d7ee", + "imageUuidOrDatabaseUri": "95cddba3-d043-4c8e-acb4-58ea8689e874", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,7 +34,7 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "9bc11e4e-1a12-4875-8397-2e1f4b62d7ee@f9941", + "uuid": "95cddba3-d043-4c8e-acb4-58ea8689e874@f9941", "displayName": "剑气2", "id": "f9941", "name": "spriteFrame", @@ -42,11 +42,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": -0.5, - "offsetY": 0, - "trimX": 20, - "trimY": 22, - "width": 159, - "height": 156, + "offsetY": 0.5, + "trimX": 30, + "trimY": 25, + "width": 139, + "height": 149, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -79.5, - -78, + -69.5, + -74.5, 0, - 79.5, - -78, + 69.5, + -74.5, 0, - -79.5, - 78, + -69.5, + 74.5, 0, - 79.5, - 78, + 69.5, + 74.5, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 20, - 178, - 179, - 178, - 20, - 22, - 179, - 22 + 30, + 175, + 169, + 175, + 30, + 26, + 169, + 26 ], "nuv": [ - 0.1, - 0.11, - 0.895, - 0.11, - 0.1, - 0.89, - 0.895, - 0.89 + 0.15, + 0.13, + 0.845, + 0.13, + 0.15, + 0.875, + 0.845, + 0.875 ], "minPos": [ - -79.5, - -78, + -69.5, + -74.5, 0 ], "maxPos": [ - 79.5, - 78, + 69.5, + 74.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "9bc11e4e-1a12-4875-8397-2e1f4b62d7ee@6c48a", + "imageUuidOrDatabaseUri": "95cddba3-d043-4c8e-acb4-58ea8689e874@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "9bc11e4e-1a12-4875-8397-2e1f4b62d7ee@6c48a" + "redirect": "95cddba3-d043-4c8e-acb4-58ea8689e874@6c48a" } } diff --git a/assets/bundles/icons/weapon/剑气3.png b/assets/bundles/icons/weapon/剑气3.png index cfe8674..a8b754a 100644 Binary files a/assets/bundles/icons/weapon/剑气3.png and b/assets/bundles/icons/weapon/剑气3.png differ diff --git a/assets/bundles/icons/weapon/剑气3.png.meta b/assets/bundles/icons/weapon/剑气3.png.meta index 78833e0..5039b3c 100644 --- a/assets/bundles/icons/weapon/剑气3.png.meta +++ b/assets/bundles/icons/weapon/剑气3.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "d9bbc236-0cc8-445c-b5da-a63a0101c3c5", + "uuid": "23048e06-f273-4bba-a21e-f371d89434aa", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "d9bbc236-0cc8-445c-b5da-a63a0101c3c5@6c48a", + "uuid": "23048e06-f273-4bba-a21e-f371d89434aa@6c48a", "displayName": "剑气3", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "d9bbc236-0cc8-445c-b5da-a63a0101c3c5", + "imageUuidOrDatabaseUri": "23048e06-f273-4bba-a21e-f371d89434aa", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,7 +34,7 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "d9bbc236-0cc8-445c-b5da-a63a0101c3c5@f9941", + "uuid": "23048e06-f273-4bba-a21e-f371d89434aa@f9941", "displayName": "剑气3", "id": "f9941", "name": "spriteFrame", @@ -43,10 +43,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0.5, - "trimX": 29, - "trimY": 19, - "width": 142, - "height": 161, + "trimX": 30, + "trimY": 20, + "width": 140, + "height": 159, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -71, - -80.5, + -70, + -79.5, 0, - 71, - -80.5, + 70, + -79.5, 0, - -71, - 80.5, + -70, + 79.5, 0, - 71, - 80.5, + 70, + 79.5, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 29, - 181, - 171, - 181, - 29, - 20, - 171, - 20 + 30, + 180, + 170, + 180, + 30, + 21, + 170, + 21 ], "nuv": [ - 0.145, - 0.1, - 0.855, - 0.1, - 0.145, - 0.905, - 0.855, - 0.905 + 0.15, + 0.105, + 0.85, + 0.105, + 0.15, + 0.9, + 0.85, + 0.9 ], "minPos": [ - -71, - -80.5, + -70, + -79.5, 0 ], "maxPos": [ - 71, - 80.5, + 70, + 79.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "d9bbc236-0cc8-445c-b5da-a63a0101c3c5@6c48a", + "imageUuidOrDatabaseUri": "23048e06-f273-4bba-a21e-f371d89434aa@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "d9bbc236-0cc8-445c-b5da-a63a0101c3c5@6c48a" + "redirect": "23048e06-f273-4bba-a21e-f371d89434aa@6c48a" } } diff --git a/assets/bundles/icons/weapon/剑气4.png b/assets/bundles/icons/weapon/剑气4.png index cb5cf89..f130b9f 100644 Binary files a/assets/bundles/icons/weapon/剑气4.png and b/assets/bundles/icons/weapon/剑气4.png differ diff --git a/assets/bundles/icons/weapon/剑气4.png.meta b/assets/bundles/icons/weapon/剑气4.png.meta index c7ab254..1619896 100644 --- a/assets/bundles/icons/weapon/剑气4.png.meta +++ b/assets/bundles/icons/weapon/剑气4.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "e4352f6b-8bbc-4fb7-93de-b5cdddc31d10", + "uuid": "8bdaed8b-445b-475e-98f9-83f4eab1dfbf", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "e4352f6b-8bbc-4fb7-93de-b5cdddc31d10@6c48a", + "uuid": "8bdaed8b-445b-475e-98f9-83f4eab1dfbf@6c48a", "displayName": "剑气4", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "e4352f6b-8bbc-4fb7-93de-b5cdddc31d10", + "imageUuidOrDatabaseUri": "8bdaed8b-445b-475e-98f9-83f4eab1dfbf", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,19 +34,19 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "e4352f6b-8bbc-4fb7-93de-b5cdddc31d10@f9941", + "uuid": "8bdaed8b-445b-475e-98f9-83f4eab1dfbf@f9941", "displayName": "剑气4", "id": "f9941", "name": "spriteFrame", "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 18, - "trimY": 19, - "width": 164, - "height": 162, + "offsetX": -0.5, + "offsetY": 0.5, + "trimX": 25, + "trimY": 22, + "width": 149, + "height": 155, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -82, - -81, + -74.5, + -77.5, 0, - 82, - -81, + 74.5, + -77.5, 0, - -82, - 81, + -74.5, + 77.5, 0, - 82, - 81, + 74.5, + 77.5, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 18, - 181, - 182, - 181, - 18, - 19, - 182, - 19 + 25, + 178, + 174, + 178, + 25, + 23, + 174, + 23 ], "nuv": [ - 0.09, - 0.095, - 0.91, - 0.095, - 0.09, - 0.905, - 0.91, - 0.905 + 0.125, + 0.115, + 0.87, + 0.115, + 0.125, + 0.89, + 0.87, + 0.89 ], "minPos": [ - -82, - -81, + -74.5, + -77.5, 0 ], "maxPos": [ - 82, - 81, + 74.5, + 77.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "e4352f6b-8bbc-4fb7-93de-b5cdddc31d10@6c48a", + "imageUuidOrDatabaseUri": "8bdaed8b-445b-475e-98f9-83f4eab1dfbf@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "e4352f6b-8bbc-4fb7-93de-b5cdddc31d10@6c48a" + "redirect": "8bdaed8b-445b-475e-98f9-83f4eab1dfbf@6c48a" } } diff --git a/assets/bundles/icons/weapon/剑气5.png b/assets/bundles/icons/weapon/剑气5.png index feb125d..b31e336 100644 Binary files a/assets/bundles/icons/weapon/剑气5.png and b/assets/bundles/icons/weapon/剑气5.png differ diff --git a/assets/bundles/icons/weapon/剑气5.png.meta b/assets/bundles/icons/weapon/剑气5.png.meta index ebb4e09..86f0408 100644 --- a/assets/bundles/icons/weapon/剑气5.png.meta +++ b/assets/bundles/icons/weapon/剑气5.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "03483133-9937-4e8f-a0ec-8c7836f73f30", + "uuid": "d87b04da-61da-478e-8d3b-f83904cdfff1", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "03483133-9937-4e8f-a0ec-8c7836f73f30@6c48a", + "uuid": "d87b04da-61da-478e-8d3b-f83904cdfff1@6c48a", "displayName": "剑气5", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "03483133-9937-4e8f-a0ec-8c7836f73f30", + "imageUuidOrDatabaseUri": "d87b04da-61da-478e-8d3b-f83904cdfff1", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,7 +34,7 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "03483133-9937-4e8f-a0ec-8c7836f73f30@f9941", + "uuid": "d87b04da-61da-478e-8d3b-f83904cdfff1@f9941", "displayName": "剑气5", "id": "f9941", "name": "spriteFrame", @@ -42,11 +42,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": -0.5, - "offsetY": 0, - "trimX": 13, - "trimY": 17, - "width": 173, - "height": 166, + "offsetY": 0.5, + "trimX": 25, + "trimY": 20, + "width": 149, + "height": 159, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -86.5, - -83, + -74.5, + -79.5, 0, - 86.5, - -83, + 74.5, + -79.5, 0, - -86.5, - 83, + -74.5, + 79.5, 0, - 86.5, - 83, + 74.5, + 79.5, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 13, - 183, - 186, - 183, - 13, - 17, - 186, - 17 + 25, + 180, + 174, + 180, + 25, + 21, + 174, + 21 ], "nuv": [ - 0.065, - 0.085, - 0.93, - 0.085, - 0.065, - 0.915, - 0.93, - 0.915 + 0.125, + 0.105, + 0.87, + 0.105, + 0.125, + 0.9, + 0.87, + 0.9 ], "minPos": [ - -86.5, - -83, + -74.5, + -79.5, 0 ], "maxPos": [ - 86.5, - 83, + 74.5, + 79.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "03483133-9937-4e8f-a0ec-8c7836f73f30@6c48a", + "imageUuidOrDatabaseUri": "d87b04da-61da-478e-8d3b-f83904cdfff1@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "03483133-9937-4e8f-a0ec-8c7836f73f30@6c48a" + "redirect": "d87b04da-61da-478e-8d3b-f83904cdfff1@6c48a" } } diff --git a/assets/bundles/icons/weapon/剑阵2.png b/assets/bundles/icons/weapon/剑阵2.png index f4cff4b..a693a02 100644 Binary files a/assets/bundles/icons/weapon/剑阵2.png and b/assets/bundles/icons/weapon/剑阵2.png differ diff --git a/assets/bundles/icons/weapon/剑阵2.png.meta b/assets/bundles/icons/weapon/剑阵2.png.meta index 5b1b2fd..98ed36c 100644 --- a/assets/bundles/icons/weapon/剑阵2.png.meta +++ b/assets/bundles/icons/weapon/剑阵2.png.meta @@ -42,11 +42,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": -0.5, - "offsetY": 0, - "trimX": 20, - "trimY": 22, - "width": 159, - "height": 156, + "offsetY": 0.5, + "trimX": 31, + "trimY": 23, + "width": 137, + "height": 153, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -79.5, - -78, + -68.5, + -76.5, 0, - 79.5, - -78, + 68.5, + -76.5, 0, - -79.5, - 78, + -68.5, + 76.5, 0, - 79.5, - 78, + 68.5, + 76.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 20, - 178, - 179, - 178, - 20, - 22, - 179, - 22 + 31, + 177, + 168, + 177, + 31, + 24, + 168, + 24 ], "nuv": [ - 0.1, - 0.11, - 0.895, - 0.11, - 0.1, - 0.89, - 0.895, - 0.89 + 0.155, + 0.12, + 0.84, + 0.12, + 0.155, + 0.885, + 0.84, + 0.885 ], "minPos": [ - -79.5, - -78, + -68.5, + -76.5, 0 ], "maxPos": [ - 79.5, - 78, + 68.5, + 76.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/剑阵3.png b/assets/bundles/icons/weapon/剑阵3.png index 878fd69..5a06bce 100644 Binary files a/assets/bundles/icons/weapon/剑阵3.png and b/assets/bundles/icons/weapon/剑阵3.png differ diff --git a/assets/bundles/icons/weapon/剑阵3.png.meta b/assets/bundles/icons/weapon/剑阵3.png.meta index f030352..8a82931 100644 --- a/assets/bundles/icons/weapon/剑阵3.png.meta +++ b/assets/bundles/icons/weapon/剑阵3.png.meta @@ -43,10 +43,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0.5, - "trimX": 29, - "trimY": 19, - "width": 142, - "height": 161, + "trimX": 30, + "trimY": 20, + "width": 140, + "height": 159, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -71, - -80.5, + -70, + -79.5, 0, - 71, - -80.5, + 70, + -79.5, 0, - -71, - 80.5, + -70, + 79.5, 0, - 71, - 80.5, + 70, + 79.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 29, - 181, - 171, - 181, - 29, - 20, - 171, - 20 + 30, + 180, + 170, + 180, + 30, + 21, + 170, + 21 ], "nuv": [ - 0.145, - 0.1, - 0.855, - 0.1, - 0.145, - 0.905, - 0.855, - 0.905 + 0.15, + 0.105, + 0.85, + 0.105, + 0.15, + 0.9, + 0.85, + 0.9 ], "minPos": [ - -71, - -80.5, + -70, + -79.5, 0 ], "maxPos": [ - 71, - 80.5, + 70, + 79.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/剑阵4.png b/assets/bundles/icons/weapon/剑阵4.png index 339323a..4c0dc3f 100644 Binary files a/assets/bundles/icons/weapon/剑阵4.png and b/assets/bundles/icons/weapon/剑阵4.png differ diff --git a/assets/bundles/icons/weapon/剑阵4.png.meta b/assets/bundles/icons/weapon/剑阵4.png.meta index 721a30f..7d2acaa 100644 --- a/assets/bundles/icons/weapon/剑阵4.png.meta +++ b/assets/bundles/icons/weapon/剑阵4.png.meta @@ -43,10 +43,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 18, - "trimY": 19, - "width": 164, - "height": 162, + "trimX": 31, + "trimY": 21, + "width": 138, + "height": 158, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -82, - -81, + -69, + -79, 0, - 82, - -81, + 69, + -79, 0, - -82, - 81, + -69, + 79, 0, - 82, - 81, + 69, + 79, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 18, - 181, - 182, - 181, - 18, - 19, - 182, - 19 + 31, + 179, + 169, + 179, + 31, + 21, + 169, + 21 ], "nuv": [ - 0.09, - 0.095, - 0.91, - 0.095, - 0.09, - 0.905, - 0.91, - 0.905 + 0.155, + 0.105, + 0.845, + 0.105, + 0.155, + 0.895, + 0.845, + 0.895 ], "minPos": [ - -82, - -81, + -69, + -79, 0 ], "maxPos": [ - 82, - 81, + 69, + 79, 0 ] }, diff --git a/assets/bundles/icons/weapon/剑阵5.png b/assets/bundles/icons/weapon/剑阵5.png index a564504..ec648ce 100644 Binary files a/assets/bundles/icons/weapon/剑阵5.png and b/assets/bundles/icons/weapon/剑阵5.png differ diff --git a/assets/bundles/icons/weapon/剑阵5.png.meta b/assets/bundles/icons/weapon/剑阵5.png.meta index 1dd949f..5a7e494 100644 --- a/assets/bundles/icons/weapon/剑阵5.png.meta +++ b/assets/bundles/icons/weapon/剑阵5.png.meta @@ -42,11 +42,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": -0.5, - "offsetY": 0, - "trimX": 13, - "trimY": 17, - "width": 173, - "height": 166, + "offsetY": 0.5, + "trimX": 30, + "trimY": 20, + "width": 139, + "height": 159, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -86.5, - -83, + -69.5, + -79.5, 0, - 86.5, - -83, + 69.5, + -79.5, 0, - -86.5, - 83, + -69.5, + 79.5, 0, - 86.5, - 83, + 69.5, + 79.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 13, - 183, - 186, - 183, - 13, - 17, - 186, - 17 + 30, + 180, + 169, + 180, + 30, + 21, + 169, + 21 ], "nuv": [ - 0.065, - 0.085, - 0.93, - 0.085, - 0.065, - 0.915, - 0.93, - 0.915 + 0.15, + 0.105, + 0.845, + 0.105, + 0.15, + 0.9, + 0.845, + 0.9 ], "minPos": [ - -86.5, - -83, + -69.5, + -79.5, 0 ], "maxPos": [ - 86.5, - 83, + 69.5, + 79.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/地刺2.png b/assets/bundles/icons/weapon/地刺2.png new file mode 100644 index 0000000..3eeece2 Binary files /dev/null and b/assets/bundles/icons/weapon/地刺2.png differ diff --git a/assets/bundles/icons/weapon/地刺2.png.meta b/assets/bundles/icons/weapon/地刺2.png.meta new file mode 100644 index 0000000..2477b43 --- /dev/null +++ b/assets/bundles/icons/weapon/地刺2.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "8a52133d-869c-4bb4-b23d-8b27e7ea550b", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "8a52133d-869c-4bb4-b23d-8b27e7ea550b@6c48a", + "displayName": "地刺2", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "8a52133d-869c-4bb4-b23d-8b27e7ea550b", + "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": "8a52133d-869c-4bb4-b23d-8b27e7ea550b@f9941", + "displayName": "地刺2", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": -0.5, + "offsetY": 0, + "trimX": 22, + "trimY": 23, + "width": 155, + "height": 154, + "rawWidth": 200, + "rawHeight": 200, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -77.5, + -77, + 0, + 77.5, + -77, + 0, + -77.5, + 77, + 0, + 77.5, + 77, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 22, + 177, + 177, + 177, + 22, + 23, + 177, + 23 + ], + "nuv": [ + 0.11, + 0.115, + 0.885, + 0.115, + 0.11, + 0.885, + 0.885, + 0.885 + ], + "minPos": [ + -77.5, + -77, + 0 + ], + "maxPos": [ + 77.5, + 77, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "8a52133d-869c-4bb4-b23d-8b27e7ea550b@6c48a", + "atlasUuid": "", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "redirect": "8a52133d-869c-4bb4-b23d-8b27e7ea550b@6c48a" + } +} diff --git a/assets/bundles/icons/weapon/地刺3.png b/assets/bundles/icons/weapon/地刺3.png new file mode 100644 index 0000000..f87c77a Binary files /dev/null and b/assets/bundles/icons/weapon/地刺3.png differ diff --git a/assets/bundles/icons/weapon/地刺3.png.meta b/assets/bundles/icons/weapon/地刺3.png.meta new file mode 100644 index 0000000..4706a2e --- /dev/null +++ b/assets/bundles/icons/weapon/地刺3.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "e8da724b-5b3e-49bb-a978-483997874b13", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "e8da724b-5b3e-49bb-a978-483997874b13@6c48a", + "displayName": "地刺3", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "e8da724b-5b3e-49bb-a978-483997874b13", + "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": "e8da724b-5b3e-49bb-a978-483997874b13@f9941", + "displayName": "地刺3", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": -0.5, + "offsetY": 0, + "trimX": 18, + "trimY": 18, + "width": 163, + "height": 164, + "rawWidth": 200, + "rawHeight": 200, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -81.5, + -82, + 0, + 81.5, + -82, + 0, + -81.5, + 82, + 0, + 81.5, + 82, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 18, + 182, + 181, + 182, + 18, + 18, + 181, + 18 + ], + "nuv": [ + 0.09, + 0.09, + 0.905, + 0.09, + 0.09, + 0.91, + 0.905, + 0.91 + ], + "minPos": [ + -81.5, + -82, + 0 + ], + "maxPos": [ + 81.5, + 82, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "e8da724b-5b3e-49bb-a978-483997874b13@6c48a", + "atlasUuid": "", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "redirect": "e8da724b-5b3e-49bb-a978-483997874b13@6c48a" + } +} diff --git a/assets/bundles/icons/weapon/地刺4.png b/assets/bundles/icons/weapon/地刺4.png new file mode 100644 index 0000000..f6fbb6a Binary files /dev/null and b/assets/bundles/icons/weapon/地刺4.png differ diff --git a/assets/bundles/icons/weapon/地刺4.png.meta b/assets/bundles/icons/weapon/地刺4.png.meta new file mode 100644 index 0000000..b3c3d9c --- /dev/null +++ b/assets/bundles/icons/weapon/地刺4.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "f6464f55-c879-44a1-b0d1-00117e90e32d", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "f6464f55-c879-44a1-b0d1-00117e90e32d@6c48a", + "displayName": "地刺4", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "f6464f55-c879-44a1-b0d1-00117e90e32d", + "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": "f6464f55-c879-44a1-b0d1-00117e90e32d@f9941", + "displayName": "地刺4", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": -0.5, + "offsetY": 0, + "trimX": 22, + "trimY": 23, + "width": 155, + "height": 154, + "rawWidth": 200, + "rawHeight": 200, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -77.5, + -77, + 0, + 77.5, + -77, + 0, + -77.5, + 77, + 0, + 77.5, + 77, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 22, + 177, + 177, + 177, + 22, + 23, + 177, + 23 + ], + "nuv": [ + 0.11, + 0.115, + 0.885, + 0.115, + 0.11, + 0.885, + 0.885, + 0.885 + ], + "minPos": [ + -77.5, + -77, + 0 + ], + "maxPos": [ + 77.5, + 77, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "f6464f55-c879-44a1-b0d1-00117e90e32d@6c48a", + "atlasUuid": "", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "redirect": "f6464f55-c879-44a1-b0d1-00117e90e32d@6c48a" + } +} diff --git a/assets/bundles/icons/weapon/地刺5.png b/assets/bundles/icons/weapon/地刺5.png new file mode 100644 index 0000000..82cdcb9 Binary files /dev/null and b/assets/bundles/icons/weapon/地刺5.png differ diff --git a/assets/bundles/icons/weapon/地刺5.png.meta b/assets/bundles/icons/weapon/地刺5.png.meta new file mode 100644 index 0000000..ef3237d --- /dev/null +++ b/assets/bundles/icons/weapon/地刺5.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "a564cdf6-780a-43bd-91b5-05d01ebe31b5", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "a564cdf6-780a-43bd-91b5-05d01ebe31b5@6c48a", + "displayName": "地刺5", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "a564cdf6-780a-43bd-91b5-05d01ebe31b5", + "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": "a564cdf6-780a-43bd-91b5-05d01ebe31b5@f9941", + "displayName": "地刺5", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": -0.5, + "offsetY": 0, + "trimX": 18, + "trimY": 18, + "width": 163, + "height": 164, + "rawWidth": 200, + "rawHeight": 200, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -81.5, + -82, + 0, + 81.5, + -82, + 0, + -81.5, + 82, + 0, + 81.5, + 82, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 18, + 182, + 181, + 182, + 18, + 18, + 181, + 18 + ], + "nuv": [ + 0.09, + 0.09, + 0.905, + 0.09, + 0.09, + 0.91, + 0.905, + 0.91 + ], + "minPos": [ + -81.5, + -82, + 0 + ], + "maxPos": [ + 81.5, + 82, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "a564cdf6-780a-43bd-91b5-05d01ebe31b5@6c48a", + "atlasUuid": "", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "redirect": "a564cdf6-780a-43bd-91b5-05d01ebe31b5@6c48a" + } +} diff --git a/assets/bundles/icons/weapon/增幅1.png b/assets/bundles/icons/weapon/增幅1.png index 893256c..a4177bf 100644 Binary files a/assets/bundles/icons/weapon/增幅1.png and b/assets/bundles/icons/weapon/增幅1.png differ diff --git a/assets/bundles/icons/weapon/增幅1.png.meta b/assets/bundles/icons/weapon/增幅1.png.meta index b0b6151..de25670 100644 --- a/assets/bundles/icons/weapon/增幅1.png.meta +++ b/assets/bundles/icons/weapon/增幅1.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -0.5, "offsetY": 0.5, - "trimX": 27, - "trimY": 35, - "width": 146, - "height": 129, + "trimX": 39, + "trimY": 22, + "width": 121, + "height": 155, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -73, - -64.5, + -60.5, + -77.5, 0, - 73, - -64.5, + 60.5, + -77.5, 0, - -73, - 64.5, + -60.5, + 77.5, 0, - 73, - 64.5, + 60.5, + 77.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 27, - 165, - 173, - 165, - 27, - 36, - 173, - 36 + 39, + 178, + 160, + 178, + 39, + 23, + 160, + 23 ], "nuv": [ - 0.135, - 0.18, - 0.865, - 0.18, - 0.135, - 0.825, - 0.865, - 0.825 + 0.195, + 0.115, + 0.8, + 0.115, + 0.195, + 0.89, + 0.8, + 0.89 ], "minPos": [ - -73, - -64.5, + -60.5, + -77.5, 0 ], "maxPos": [ - 73, - 64.5, + 60.5, + 77.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/增幅2.png b/assets/bundles/icons/weapon/增幅2.png index 5260896..1724983 100644 Binary files a/assets/bundles/icons/weapon/增幅2.png and b/assets/bundles/icons/weapon/增幅2.png differ diff --git a/assets/bundles/icons/weapon/增幅2.png.meta b/assets/bundles/icons/weapon/增幅2.png.meta index 9eb3d1d..41a39fe 100644 --- a/assets/bundles/icons/weapon/增幅2.png.meta +++ b/assets/bundles/icons/weapon/增幅2.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 24, - "trimY": 30, - "width": 152, - "height": 140, + "offsetX": -0.5, + "offsetY": 0.5, + "trimX": 25, + "trimY": 16, + "width": 149, + "height": 167, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -76, - -70, + -74.5, + -83.5, 0, - 76, - -70, + 74.5, + -83.5, 0, - -76, - 70, + -74.5, + 83.5, 0, - 76, - 70, + 74.5, + 83.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 24, - 170, - 176, - 170, - 24, - 30, - 176, - 30 + 25, + 184, + 174, + 184, + 25, + 17, + 174, + 17 ], "nuv": [ - 0.12, - 0.15, - 0.88, - 0.15, - 0.12, - 0.85, - 0.88, - 0.85 + 0.125, + 0.085, + 0.87, + 0.085, + 0.125, + 0.92, + 0.87, + 0.92 ], "minPos": [ - -76, - -70, + -74.5, + -83.5, 0 ], "maxPos": [ - 76, - 70, + 74.5, + 83.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/增幅3.png b/assets/bundles/icons/weapon/增幅3.png index 5ec8ca0..c03f583 100644 Binary files a/assets/bundles/icons/weapon/增幅3.png and b/assets/bundles/icons/weapon/增幅3.png differ diff --git a/assets/bundles/icons/weapon/增幅3.png.meta b/assets/bundles/icons/weapon/增幅3.png.meta index 94a3678..4b06643 100644 --- a/assets/bundles/icons/weapon/增幅3.png.meta +++ b/assets/bundles/icons/weapon/增幅3.png.meta @@ -43,10 +43,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0.5, - "trimX": 26, - "trimY": 20, - "width": 148, - "height": 159, + "trimX": 34, + "trimY": 22, + "width": 132, + "height": 155, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -74, - -79.5, + -66, + -77.5, 0, - 74, - -79.5, + 66, + -77.5, 0, - -74, - 79.5, + -66, + 77.5, 0, - 74, - 79.5, + 66, + 77.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 26, - 180, - 174, - 180, - 26, - 21, - 174, - 21 + 34, + 178, + 166, + 178, + 34, + 23, + 166, + 23 ], "nuv": [ - 0.13, - 0.105, - 0.87, - 0.105, - 0.13, - 0.9, - 0.87, - 0.9 + 0.17, + 0.115, + 0.83, + 0.115, + 0.17, + 0.89, + 0.83, + 0.89 ], "minPos": [ - -74, - -79.5, + -66, + -77.5, 0 ], "maxPos": [ - 74, - 79.5, + 66, + 77.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/增幅4.png b/assets/bundles/icons/weapon/增幅4.png index 3ac5e3b..930efa8 100644 Binary files a/assets/bundles/icons/weapon/增幅4.png and b/assets/bundles/icons/weapon/增幅4.png differ diff --git a/assets/bundles/icons/weapon/增幅4.png.meta b/assets/bundles/icons/weapon/增幅4.png.meta index 6eef9e6..af5e5cc 100644 --- a/assets/bundles/icons/weapon/增幅4.png.meta +++ b/assets/bundles/icons/weapon/增幅4.png.meta @@ -43,10 +43,10 @@ "rotated": false, "offsetX": -0.5, "offsetY": 0, - "trimX": 16, - "trimY": 25, - "width": 167, - "height": 150, + "trimX": 25, + "trimY": 16, + "width": 149, + "height": 168, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -83.5, - -75, + -74.5, + -84, 0, - 83.5, - -75, + 74.5, + -84, 0, - -83.5, - 75, + -74.5, + 84, 0, - 83.5, - 75, + 74.5, + 84, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 16, - 175, - 183, - 175, - 16, 25, - 183, - 25 + 184, + 174, + 184, + 25, + 16, + 174, + 16 ], "nuv": [ - 0.08, - 0.125, - 0.915, 0.125, 0.08, - 0.875, - 0.915, - 0.875 + 0.87, + 0.08, + 0.125, + 0.92, + 0.87, + 0.92 ], "minPos": [ - -83.5, - -75, + -74.5, + -84, 0 ], "maxPos": [ - 83.5, - 75, + 74.5, + 84, 0 ] }, diff --git a/assets/bundles/icons/weapon/增幅5.png b/assets/bundles/icons/weapon/增幅5.png index 5a9a533..3c3270c 100644 Binary files a/assets/bundles/icons/weapon/增幅5.png and b/assets/bundles/icons/weapon/增幅5.png differ diff --git a/assets/bundles/icons/weapon/增幅5.png.meta b/assets/bundles/icons/weapon/增幅5.png.meta index 5be9df6..ca04546 100644 --- a/assets/bundles/icons/weapon/增幅5.png.meta +++ b/assets/bundles/icons/weapon/增幅5.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": -0.5, + "offsetX": 0, "offsetY": 0.5, - "trimX": 17, - "trimY": 20, - "width": 165, - "height": 159, + "trimX": 34, + "trimY": 17, + "width": 132, + "height": 165, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ + -66, -82.5, - -79.5, - 0, - 82.5, - -79.5, 0, + 66, -82.5, - 79.5, 0, + -66, + 82.5, + 0, + 66, 82.5, - 79.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 17, - 180, - 182, - 180, - 17, - 21, - 182, - 21 + 34, + 183, + 166, + 183, + 34, + 18, + 166, + 18 ], "nuv": [ - 0.085, - 0.105, - 0.91, - 0.105, - 0.085, - 0.9, - 0.91, - 0.9 + 0.17, + 0.09, + 0.83, + 0.09, + 0.17, + 0.915, + 0.83, + 0.915 ], "minPos": [ + -66, -82.5, - -79.5, 0 ], "maxPos": [ + 66, 82.5, - 79.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/宝石框小0.png b/assets/bundles/icons/weapon/宝石框小0.png index 1ab297b..f0916c8 100644 Binary files a/assets/bundles/icons/weapon/宝石框小0.png and b/assets/bundles/icons/weapon/宝石框小0.png differ diff --git a/assets/bundles/icons/weapon/宝石框小0.png.meta b/assets/bundles/icons/weapon/宝石框小0.png.meta index 933ae06..436720c 100644 --- a/assets/bundles/icons/weapon/宝石框小0.png.meta +++ b/assets/bundles/icons/weapon/宝石框小0.png.meta @@ -45,10 +45,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 63, - "height": 62, - "rawWidth": 63, - "rawHeight": 62, + "width": 82, + "height": 81, + "rawWidth": 82, + "rawHeight": 81, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -31.5, - -31, + -41, + -40.5, 0, - 31.5, - -31, + 41, + -40.5, 0, - -31.5, - 31, + -41, + 40.5, 0, - 31.5, - 31, + 41, + 40.5, 0 ], "indexes": [ @@ -83,12 +83,12 @@ ], "uv": [ 0, - 62, - 63, - 62, + 81, + 82, + 81, 0, 0, - 63, + 82, 0 ], "nuv": [ @@ -102,13 +102,13 @@ 1 ], "minPos": [ - -31.5, - -31, + -41, + -40.5, 0 ], "maxPos": [ - 31.5, - 31, + 41, + 40.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/宝石框小1.png b/assets/bundles/icons/weapon/宝石框小1.png index 351399b..acbf0e0 100644 Binary files a/assets/bundles/icons/weapon/宝石框小1.png and b/assets/bundles/icons/weapon/宝石框小1.png differ diff --git a/assets/bundles/icons/weapon/宝石框小1.png.meta b/assets/bundles/icons/weapon/宝石框小1.png.meta index 45471ad..c97ae07 100644 --- a/assets/bundles/icons/weapon/宝石框小1.png.meta +++ b/assets/bundles/icons/weapon/宝石框小1.png.meta @@ -45,10 +45,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 62, - "height": 62, - "rawWidth": 62, - "rawHeight": 62, + "width": 82, + "height": 81, + "rawWidth": 82, + "rawHeight": 81, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -31, - -31, + -41, + -40.5, 0, - 31, - -31, + 41, + -40.5, 0, - -31, - 31, + -41, + 40.5, 0, - 31, - 31, + 41, + 40.5, 0 ], "indexes": [ @@ -83,12 +83,12 @@ ], "uv": [ 0, - 62, - 62, - 62, + 81, + 82, + 81, 0, 0, - 62, + 82, 0 ], "nuv": [ @@ -102,13 +102,13 @@ 1 ], "minPos": [ - -31, - -31, + -41, + -40.5, 0 ], "maxPos": [ - 31, - 31, + 41, + 40.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/宝石框小2.png b/assets/bundles/icons/weapon/宝石框小2.png index e0c278e..c690d9e 100644 Binary files a/assets/bundles/icons/weapon/宝石框小2.png and b/assets/bundles/icons/weapon/宝石框小2.png differ diff --git a/assets/bundles/icons/weapon/宝石框小2.png.meta b/assets/bundles/icons/weapon/宝石框小2.png.meta index 656dabc..f1ad8a3 100644 --- a/assets/bundles/icons/weapon/宝石框小2.png.meta +++ b/assets/bundles/icons/weapon/宝石框小2.png.meta @@ -45,10 +45,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 62, - "height": 62, - "rawWidth": 62, - "rawHeight": 62, + "width": 82, + "height": 81, + "rawWidth": 82, + "rawHeight": 81, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -31, - -31, + -41, + -40.5, 0, - 31, - -31, + 41, + -40.5, 0, - -31, - 31, + -41, + 40.5, 0, - 31, - 31, + 41, + 40.5, 0 ], "indexes": [ @@ -83,12 +83,12 @@ ], "uv": [ 0, - 62, - 62, - 62, + 81, + 82, + 81, 0, 0, - 62, + 82, 0 ], "nuv": [ @@ -102,13 +102,13 @@ 1 ], "minPos": [ - -31, - -31, + -41, + -40.5, 0 ], "maxPos": [ - 31, - 31, + 41, + 40.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/宝石框小3.png b/assets/bundles/icons/weapon/宝石框小3.png index 452fe68..d0cbd3f 100644 Binary files a/assets/bundles/icons/weapon/宝石框小3.png and b/assets/bundles/icons/weapon/宝石框小3.png differ diff --git a/assets/bundles/icons/weapon/宝石框小3.png.meta b/assets/bundles/icons/weapon/宝石框小3.png.meta index a00fab0..c9d5e59 100644 --- a/assets/bundles/icons/weapon/宝石框小3.png.meta +++ b/assets/bundles/icons/weapon/宝石框小3.png.meta @@ -45,10 +45,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 62, - "height": 62, - "rawWidth": 62, - "rawHeight": 62, + "width": 82, + "height": 81, + "rawWidth": 82, + "rawHeight": 81, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -31, - -31, + -41, + -40.5, 0, - 31, - -31, + 41, + -40.5, 0, - -31, - 31, + -41, + 40.5, 0, - 31, - 31, + 41, + 40.5, 0 ], "indexes": [ @@ -83,12 +83,12 @@ ], "uv": [ 0, - 62, - 62, - 62, + 81, + 82, + 81, 0, 0, - 62, + 82, 0 ], "nuv": [ @@ -102,13 +102,13 @@ 1 ], "minPos": [ - -31, - -31, + -41, + -40.5, 0 ], "maxPos": [ - 31, - 31, + 41, + 40.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/宝石框小4.png b/assets/bundles/icons/weapon/宝石框小4.png index ff912c5..af84a44 100644 Binary files a/assets/bundles/icons/weapon/宝石框小4.png and b/assets/bundles/icons/weapon/宝石框小4.png differ diff --git a/assets/bundles/icons/weapon/宝石框小4.png.meta b/assets/bundles/icons/weapon/宝石框小4.png.meta index 9edcaab..5df539a 100644 --- a/assets/bundles/icons/weapon/宝石框小4.png.meta +++ b/assets/bundles/icons/weapon/宝石框小4.png.meta @@ -45,10 +45,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 62, - "height": 62, - "rawWidth": 62, - "rawHeight": 62, + "width": 82, + "height": 81, + "rawWidth": 82, + "rawHeight": 81, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -31, - -31, + -41, + -40.5, 0, - 31, - -31, + 41, + -40.5, 0, - -31, - 31, + -41, + 40.5, 0, - 31, - 31, + 41, + 40.5, 0 ], "indexes": [ @@ -83,12 +83,12 @@ ], "uv": [ 0, - 62, - 62, - 62, + 81, + 82, + 81, 0, 0, - 62, + 82, 0 ], "nuv": [ @@ -102,13 +102,13 @@ 1 ], "minPos": [ - -31, - -31, + -41, + -40.5, 0 ], "maxPos": [ - 31, - 31, + 41, + 40.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/宝石框小5.png b/assets/bundles/icons/weapon/宝石框小5.png index 4e8cbd1..667d537 100644 Binary files a/assets/bundles/icons/weapon/宝石框小5.png and b/assets/bundles/icons/weapon/宝石框小5.png differ diff --git a/assets/bundles/icons/weapon/宝石框小5.png.meta b/assets/bundles/icons/weapon/宝石框小5.png.meta index ec47537..7968f02 100644 --- a/assets/bundles/icons/weapon/宝石框小5.png.meta +++ b/assets/bundles/icons/weapon/宝石框小5.png.meta @@ -45,10 +45,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 63, - "height": 62, - "rawWidth": 63, - "rawHeight": 62, + "width": 82, + "height": 81, + "rawWidth": 82, + "rawHeight": 81, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -31.5, - -31, + -41, + -40.5, 0, - 31.5, - -31, + 41, + -40.5, 0, - -31.5, - 31, + -41, + 40.5, 0, - 31.5, - 31, + 41, + 40.5, 0 ], "indexes": [ @@ -83,12 +83,12 @@ ], "uv": [ 0, - 62, - 63, - 62, + 81, + 82, + 81, 0, 0, - 63, + 82, 0 ], "nuv": [ @@ -102,13 +102,13 @@ 1 ], "minPos": [ - -31.5, - -31, + -41, + -40.5, 0 ], "maxPos": [ - 31.5, - 31, + 41, + 40.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/攻击1.png b/assets/bundles/icons/weapon/攻击1.png index 8ee4e1f..8c885af 100644 Binary files a/assets/bundles/icons/weapon/攻击1.png and b/assets/bundles/icons/weapon/攻击1.png differ diff --git a/assets/bundles/icons/weapon/攻击1.png.meta b/assets/bundles/icons/weapon/攻击1.png.meta index 0b6780c..93035f4 100644 --- a/assets/bundles/icons/weapon/攻击1.png.meta +++ b/assets/bundles/icons/weapon/攻击1.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "526c0ba2-b197-48f0-8d6b-d5cf50355691", + "uuid": "6ee8b440-d4c1-4153-93e0-be36835f3c66", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "526c0ba2-b197-48f0-8d6b-d5cf50355691@6c48a", + "uuid": "6ee8b440-d4c1-4153-93e0-be36835f3c66@6c48a", "displayName": "攻击1", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "526c0ba2-b197-48f0-8d6b-d5cf50355691", + "imageUuidOrDatabaseUri": "6ee8b440-d4c1-4153-93e0-be36835f3c66", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,19 +34,19 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "526c0ba2-b197-48f0-8d6b-d5cf50355691@f9941", + "uuid": "6ee8b440-d4c1-4153-93e0-be36835f3c66@f9941", "displayName": "攻击1", "id": "f9941", "name": "spriteFrame", "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": -0.5, + "offsetX": 0, "offsetY": 0, - "trimX": 25, - "trimY": 34, - "width": 149, - "height": 132, + "trimX": 33, + "trimY": 44, + "width": 134, + "height": 112, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -74.5, - -66, + -67, + -56, 0, - 74.5, - -66, + 67, + -56, 0, - -74.5, - 66, + -67, + 56, 0, - 74.5, - 66, + 67, + 56, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 25, - 166, - 174, - 166, - 25, - 34, - 174, - 34 + 33, + 156, + 167, + 156, + 33, + 44, + 167, + 44 ], "nuv": [ - 0.125, - 0.17, - 0.87, - 0.17, - 0.125, - 0.83, - 0.87, - 0.83 + 0.165, + 0.22, + 0.835, + 0.22, + 0.165, + 0.78, + 0.835, + 0.78 ], "minPos": [ - -74.5, - -66, + -67, + -56, 0 ], "maxPos": [ - 74.5, - 66, + 67, + 56, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "526c0ba2-b197-48f0-8d6b-d5cf50355691@6c48a", + "imageUuidOrDatabaseUri": "6ee8b440-d4c1-4153-93e0-be36835f3c66@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "526c0ba2-b197-48f0-8d6b-d5cf50355691@6c48a" + "redirect": "6ee8b440-d4c1-4153-93e0-be36835f3c66@6c48a" } } diff --git a/assets/bundles/icons/weapon/攻击2.png b/assets/bundles/icons/weapon/攻击2.png index b9919d9..2139645 100644 Binary files a/assets/bundles/icons/weapon/攻击2.png and b/assets/bundles/icons/weapon/攻击2.png differ diff --git a/assets/bundles/icons/weapon/攻击2.png.meta b/assets/bundles/icons/weapon/攻击2.png.meta index 88dce04..252d75a 100644 --- a/assets/bundles/icons/weapon/攻击2.png.meta +++ b/assets/bundles/icons/weapon/攻击2.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "ca1a40a9-4ecc-4f60-8d43-a2ea6c3588af", + "uuid": "82b85f84-f904-4852-a703-dd6d2e51de6c", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "ca1a40a9-4ecc-4f60-8d43-a2ea6c3588af@6c48a", + "uuid": "82b85f84-f904-4852-a703-dd6d2e51de6c@6c48a", "displayName": "攻击2", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "ca1a40a9-4ecc-4f60-8d43-a2ea6c3588af", + "imageUuidOrDatabaseUri": "82b85f84-f904-4852-a703-dd6d2e51de6c", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,19 +34,19 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "ca1a40a9-4ecc-4f60-8d43-a2ea6c3588af@f9941", + "uuid": "82b85f84-f904-4852-a703-dd6d2e51de6c@f9941", "displayName": "攻击2", "id": "f9941", "name": "spriteFrame", "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0.5, - "trimX": 19, - "trimY": 18, - "width": 162, - "height": 163, + "offsetX": -0.5, + "offsetY": 0, + "trimX": 32, + "trimY": 43, + "width": 135, + "height": 114, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -81, - -81.5, + -67.5, + -57, 0, - 81, - -81.5, + 67.5, + -57, 0, - -81, - 81.5, + -67.5, + 57, 0, - 81, - 81.5, + 67.5, + 57, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 19, - 182, - 181, - 182, - 19, - 19, - 181, - 19 + 32, + 157, + 167, + 157, + 32, + 43, + 167, + 43 ], "nuv": [ - 0.095, - 0.095, - 0.905, - 0.095, - 0.095, - 0.91, - 0.905, - 0.91 + 0.16, + 0.215, + 0.835, + 0.215, + 0.16, + 0.785, + 0.835, + 0.785 ], "minPos": [ - -81, - -81.5, + -67.5, + -57, 0 ], "maxPos": [ - 81, - 81.5, + 67.5, + 57, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "ca1a40a9-4ecc-4f60-8d43-a2ea6c3588af@6c48a", + "imageUuidOrDatabaseUri": "82b85f84-f904-4852-a703-dd6d2e51de6c@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "ca1a40a9-4ecc-4f60-8d43-a2ea6c3588af@6c48a" + "redirect": "82b85f84-f904-4852-a703-dd6d2e51de6c@6c48a" } } diff --git a/assets/bundles/icons/weapon/攻击3.png b/assets/bundles/icons/weapon/攻击3.png index c59b1ab..67063f9 100644 Binary files a/assets/bundles/icons/weapon/攻击3.png and b/assets/bundles/icons/weapon/攻击3.png differ diff --git a/assets/bundles/icons/weapon/攻击3.png.meta b/assets/bundles/icons/weapon/攻击3.png.meta index 16f9e92..69199f1 100644 --- a/assets/bundles/icons/weapon/攻击3.png.meta +++ b/assets/bundles/icons/weapon/攻击3.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "88df4b88-f1dc-4117-a6b2-356653d33c06", + "uuid": "21efd1c5-ef2d-4ad8-9937-3047be534612", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "88df4b88-f1dc-4117-a6b2-356653d33c06@6c48a", + "uuid": "21efd1c5-ef2d-4ad8-9937-3047be534612@6c48a", "displayName": "攻击3", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "88df4b88-f1dc-4117-a6b2-356653d33c06", + "imageUuidOrDatabaseUri": "21efd1c5-ef2d-4ad8-9937-3047be534612", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,19 +34,19 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "88df4b88-f1dc-4117-a6b2-356653d33c06@f9941", + "uuid": "21efd1c5-ef2d-4ad8-9937-3047be534612@f9941", "displayName": "攻击3", "id": "f9941", "name": "spriteFrame", "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": -0.5, + "offsetX": 0, "offsetY": 0, - "trimX": 30, - "trimY": 18, - "width": 139, - "height": 164, + "trimX": 33, + "trimY": 40, + "width": 134, + "height": 120, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -69.5, - -82, + -67, + -60, 0, - 69.5, - -82, + 67, + -60, 0, - -69.5, - 82, + -67, + 60, 0, - 69.5, - 82, + 67, + 60, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 30, - 182, - 169, - 182, - 30, - 18, - 169, - 18 + 33, + 160, + 167, + 160, + 33, + 40, + 167, + 40 ], "nuv": [ - 0.15, - 0.09, - 0.845, - 0.09, - 0.15, - 0.91, - 0.845, - 0.91 + 0.165, + 0.2, + 0.835, + 0.2, + 0.165, + 0.8, + 0.835, + 0.8 ], "minPos": [ - -69.5, - -82, + -67, + -60, 0 ], "maxPos": [ - 69.5, - 82, + 67, + 60, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "88df4b88-f1dc-4117-a6b2-356653d33c06@6c48a", + "imageUuidOrDatabaseUri": "21efd1c5-ef2d-4ad8-9937-3047be534612@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "88df4b88-f1dc-4117-a6b2-356653d33c06@6c48a" + "redirect": "21efd1c5-ef2d-4ad8-9937-3047be534612@6c48a" } } diff --git a/assets/bundles/icons/weapon/攻击4.png b/assets/bundles/icons/weapon/攻击4.png index 3f270e7..c3a119e 100644 Binary files a/assets/bundles/icons/weapon/攻击4.png and b/assets/bundles/icons/weapon/攻击4.png differ diff --git a/assets/bundles/icons/weapon/攻击4.png.meta b/assets/bundles/icons/weapon/攻击4.png.meta index 7c787b5..9364ca1 100644 --- a/assets/bundles/icons/weapon/攻击4.png.meta +++ b/assets/bundles/icons/weapon/攻击4.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "1487be2e-0a26-497b-a7d2-419a16eff274", + "uuid": "cbc3d4a7-1d85-4505-82fa-8f305ec20733", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "1487be2e-0a26-497b-a7d2-419a16eff274@6c48a", + "uuid": "cbc3d4a7-1d85-4505-82fa-8f305ec20733@6c48a", "displayName": "攻击4", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "1487be2e-0a26-497b-a7d2-419a16eff274", + "imageUuidOrDatabaseUri": "cbc3d4a7-1d85-4505-82fa-8f305ec20733", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,7 +34,7 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "1487be2e-0a26-497b-a7d2-419a16eff274@f9941", + "uuid": "cbc3d4a7-1d85-4505-82fa-8f305ec20733@f9941", "displayName": "攻击4", "id": "f9941", "name": "spriteFrame", @@ -42,11 +42,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0.5, - "trimX": 22, - "trimY": 21, - "width": 156, - "height": 157, + "offsetY": 0, + "trimX": 26, + "trimY": 39, + "width": 148, + "height": 122, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -78, - -78.5, + -74, + -61, 0, - 78, - -78.5, + 74, + -61, 0, - -78, - 78.5, + -74, + 61, 0, - 78, - 78.5, + 74, + 61, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 22, - 179, - 178, - 179, - 22, - 22, - 178, - 22 + 26, + 161, + 174, + 161, + 26, + 39, + 174, + 39 ], "nuv": [ - 0.11, - 0.11, - 0.89, - 0.11, - 0.11, - 0.895, - 0.89, - 0.895 + 0.13, + 0.195, + 0.87, + 0.195, + 0.13, + 0.805, + 0.87, + 0.805 ], "minPos": [ - -78, - -78.5, + -74, + -61, 0 ], "maxPos": [ - 78, - 78.5, + 74, + 61, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "1487be2e-0a26-497b-a7d2-419a16eff274@6c48a", + "imageUuidOrDatabaseUri": "cbc3d4a7-1d85-4505-82fa-8f305ec20733@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "1487be2e-0a26-497b-a7d2-419a16eff274@6c48a" + "redirect": "cbc3d4a7-1d85-4505-82fa-8f305ec20733@6c48a" } } diff --git a/assets/bundles/icons/weapon/攻击5.png b/assets/bundles/icons/weapon/攻击5.png index 19956de..2993afd 100644 Binary files a/assets/bundles/icons/weapon/攻击5.png and b/assets/bundles/icons/weapon/攻击5.png differ diff --git a/assets/bundles/icons/weapon/攻击5.png.meta b/assets/bundles/icons/weapon/攻击5.png.meta index 3e5955a..619034b 100644 --- a/assets/bundles/icons/weapon/攻击5.png.meta +++ b/assets/bundles/icons/weapon/攻击5.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "e3c838a9-25d7-4b17-9979-95ca66c39803", + "uuid": "a1d54828-b299-4ab8-9fb3-fabd6403d843", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "e3c838a9-25d7-4b17-9979-95ca66c39803@6c48a", + "uuid": "a1d54828-b299-4ab8-9fb3-fabd6403d843@6c48a", "displayName": "攻击5", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "e3c838a9-25d7-4b17-9979-95ca66c39803", + "imageUuidOrDatabaseUri": "a1d54828-b299-4ab8-9fb3-fabd6403d843", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,19 +34,19 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "e3c838a9-25d7-4b17-9979-95ca66c39803@f9941", + "uuid": "a1d54828-b299-4ab8-9fb3-fabd6403d843@f9941", "displayName": "攻击5", "id": "f9941", "name": "spriteFrame", "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": -0.5, + "offsetX": 0, "offsetY": 0.5, - "trimX": 17, - "trimY": 18, - "width": 165, - "height": 163, + "trimX": 26, + "trimY": 37, + "width": 148, + "height": 125, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -82.5, - -81.5, + -74, + -62.5, 0, - 82.5, - -81.5, + 74, + -62.5, 0, - -82.5, - 81.5, + -74, + 62.5, 0, - 82.5, - 81.5, + 74, + 62.5, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 17, - 182, - 182, - 182, - 17, - 19, - 182, - 19 + 26, + 163, + 174, + 163, + 26, + 38, + 174, + 38 ], "nuv": [ - 0.085, - 0.095, - 0.91, - 0.095, - 0.085, - 0.91, - 0.91, - 0.91 + 0.13, + 0.19, + 0.87, + 0.19, + 0.13, + 0.815, + 0.87, + 0.815 ], "minPos": [ - -82.5, - -81.5, + -74, + -62.5, 0 ], "maxPos": [ - 82.5, - 81.5, + 74, + 62.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "e3c838a9-25d7-4b17-9979-95ca66c39803@6c48a", + "imageUuidOrDatabaseUri": "a1d54828-b299-4ab8-9fb3-fabd6403d843@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "e3c838a9-25d7-4b17-9979-95ca66c39803@6c48a" + "redirect": "a1d54828-b299-4ab8-9fb3-fabd6403d843@6c48a" } } diff --git a/assets/bundles/icons/weapon/攻速1.png b/assets/bundles/icons/weapon/攻速1.png index 41828ef..a553473 100644 Binary files a/assets/bundles/icons/weapon/攻速1.png and b/assets/bundles/icons/weapon/攻速1.png differ diff --git a/assets/bundles/icons/weapon/攻速1.png.meta b/assets/bundles/icons/weapon/攻速1.png.meta index fb2399d..fc76ed3 100644 --- a/assets/bundles/icons/weapon/攻速1.png.meta +++ b/assets/bundles/icons/weapon/攻速1.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "ad8df068-fe70-4808-b6fd-e073bb929628", + "uuid": "afc9a50f-a748-4cdb-af4a-c1e3c28eaeff", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "ad8df068-fe70-4808-b6fd-e073bb929628@6c48a", + "uuid": "afc9a50f-a748-4cdb-af4a-c1e3c28eaeff@6c48a", "displayName": "攻速1", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "ad8df068-fe70-4808-b6fd-e073bb929628", + "imageUuidOrDatabaseUri": "afc9a50f-a748-4cdb-af4a-c1e3c28eaeff", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,7 +34,7 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "ad8df068-fe70-4808-b6fd-e073bb929628@f9941", + "uuid": "afc9a50f-a748-4cdb-af4a-c1e3c28eaeff@f9941", "displayName": "攻速1", "id": "f9941", "name": "spriteFrame", @@ -42,11 +42,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": -0.5, - "offsetY": 0, - "trimX": 25, - "trimY": 34, - "width": 149, - "height": 132, + "offsetY": 0.5, + "trimX": 30, + "trimY": 30, + "width": 139, + "height": 139, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -74.5, - -66, + -69.5, + -69.5, 0, - 74.5, - -66, + 69.5, + -69.5, 0, - -74.5, - 66, + -69.5, + 69.5, 0, - 74.5, - 66, + 69.5, + 69.5, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 25, - 166, - 174, - 166, - 25, - 34, - 174, - 34 + 30, + 170, + 169, + 170, + 30, + 31, + 169, + 31 ], "nuv": [ - 0.125, - 0.17, - 0.87, - 0.17, - 0.125, - 0.83, - 0.87, - 0.83 + 0.15, + 0.155, + 0.845, + 0.155, + 0.15, + 0.85, + 0.845, + 0.85 ], "minPos": [ - -74.5, - -66, + -69.5, + -69.5, 0 ], "maxPos": [ - 74.5, - 66, + 69.5, + 69.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "ad8df068-fe70-4808-b6fd-e073bb929628@6c48a", + "imageUuidOrDatabaseUri": "afc9a50f-a748-4cdb-af4a-c1e3c28eaeff@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "ad8df068-fe70-4808-b6fd-e073bb929628@6c48a" + "redirect": "afc9a50f-a748-4cdb-af4a-c1e3c28eaeff@6c48a" } } diff --git a/assets/bundles/icons/weapon/攻速2.png b/assets/bundles/icons/weapon/攻速2.png index 94d1d9b..ccc3154 100644 Binary files a/assets/bundles/icons/weapon/攻速2.png and b/assets/bundles/icons/weapon/攻速2.png differ diff --git a/assets/bundles/icons/weapon/攻速2.png.meta b/assets/bundles/icons/weapon/攻速2.png.meta index e3c66f1..5030687 100644 --- a/assets/bundles/icons/weapon/攻速2.png.meta +++ b/assets/bundles/icons/weapon/攻速2.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "98cb94c4-0c5d-49d2-b9d5-4f15a203417c", + "uuid": "02a86fd7-38cf-4960-8e3d-b8329c456794", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "98cb94c4-0c5d-49d2-b9d5-4f15a203417c@6c48a", + "uuid": "02a86fd7-38cf-4960-8e3d-b8329c456794@6c48a", "displayName": "攻速2", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "98cb94c4-0c5d-49d2-b9d5-4f15a203417c", + "imageUuidOrDatabaseUri": "02a86fd7-38cf-4960-8e3d-b8329c456794", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,19 +34,19 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "98cb94c4-0c5d-49d2-b9d5-4f15a203417c@f9941", + "uuid": "02a86fd7-38cf-4960-8e3d-b8329c456794@f9941", "displayName": "攻速2", "id": "f9941", "name": "spriteFrame", "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -0.5, "offsetY": 0.5, - "trimX": 19, - "trimY": 18, - "width": 162, - "height": 163, + "trimX": 26, + "trimY": 25, + "width": 147, + "height": 149, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -81, - -81.5, + -73.5, + -74.5, 0, - 81, - -81.5, + 73.5, + -74.5, 0, - -81, - 81.5, + -73.5, + 74.5, 0, - 81, - 81.5, + 73.5, + 74.5, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 19, - 182, - 181, - 182, - 19, - 19, - 181, - 19 + 26, + 175, + 173, + 175, + 26, + 26, + 173, + 26 ], "nuv": [ - 0.095, - 0.095, - 0.905, - 0.095, - 0.095, - 0.91, - 0.905, - 0.91 + 0.13, + 0.13, + 0.865, + 0.13, + 0.13, + 0.875, + 0.865, + 0.875 ], "minPos": [ - -81, - -81.5, + -73.5, + -74.5, 0 ], "maxPos": [ - 81, - 81.5, + 73.5, + 74.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "98cb94c4-0c5d-49d2-b9d5-4f15a203417c@6c48a", + "imageUuidOrDatabaseUri": "02a86fd7-38cf-4960-8e3d-b8329c456794@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "98cb94c4-0c5d-49d2-b9d5-4f15a203417c@6c48a" + "redirect": "02a86fd7-38cf-4960-8e3d-b8329c456794@6c48a" } } diff --git a/assets/bundles/icons/weapon/攻速3.png b/assets/bundles/icons/weapon/攻速3.png index 9542140..2cda00b 100644 Binary files a/assets/bundles/icons/weapon/攻速3.png and b/assets/bundles/icons/weapon/攻速3.png differ diff --git a/assets/bundles/icons/weapon/攻速3.png.meta b/assets/bundles/icons/weapon/攻速3.png.meta index bf6eb04..b5919d9 100644 --- a/assets/bundles/icons/weapon/攻速3.png.meta +++ b/assets/bundles/icons/weapon/攻速3.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "d612951b-edbf-4cef-8d38-ec815ae7aad3", + "uuid": "ee4b9c51-abf4-4ca2-9dae-1bfd8be1042c", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "d612951b-edbf-4cef-8d38-ec815ae7aad3@6c48a", + "uuid": "ee4b9c51-abf4-4ca2-9dae-1bfd8be1042c@6c48a", "displayName": "攻速3", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "d612951b-edbf-4cef-8d38-ec815ae7aad3", + "imageUuidOrDatabaseUri": "ee4b9c51-abf4-4ca2-9dae-1bfd8be1042c", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,7 +34,7 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "d612951b-edbf-4cef-8d38-ec815ae7aad3@f9941", + "uuid": "ee4b9c51-abf4-4ca2-9dae-1bfd8be1042c@f9941", "displayName": "攻速3", "id": "f9941", "name": "spriteFrame", @@ -42,11 +42,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": -0.5, - "offsetY": 0, - "trimX": 30, - "trimY": 18, - "width": 139, - "height": 164, + "offsetY": 0.5, + "trimX": 26, + "trimY": 25, + "width": 147, + "height": 149, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -69.5, - -82, + -73.5, + -74.5, 0, - 69.5, - -82, + 73.5, + -74.5, 0, - -69.5, - 82, + -73.5, + 74.5, 0, - 69.5, - 82, + 73.5, + 74.5, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 30, - 182, - 169, - 182, - 30, - 18, - 169, - 18 + 26, + 175, + 173, + 175, + 26, + 26, + 173, + 26 ], "nuv": [ - 0.15, - 0.09, - 0.845, - 0.09, - 0.15, - 0.91, - 0.845, - 0.91 + 0.13, + 0.13, + 0.865, + 0.13, + 0.13, + 0.875, + 0.865, + 0.875 ], "minPos": [ - -69.5, - -82, + -73.5, + -74.5, 0 ], "maxPos": [ - 69.5, - 82, + 73.5, + 74.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "d612951b-edbf-4cef-8d38-ec815ae7aad3@6c48a", + "imageUuidOrDatabaseUri": "ee4b9c51-abf4-4ca2-9dae-1bfd8be1042c@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "d612951b-edbf-4cef-8d38-ec815ae7aad3@6c48a" + "redirect": "ee4b9c51-abf4-4ca2-9dae-1bfd8be1042c@6c48a" } } diff --git a/assets/bundles/icons/weapon/攻速4.png b/assets/bundles/icons/weapon/攻速4.png index d3df2aa..661678b 100644 Binary files a/assets/bundles/icons/weapon/攻速4.png and b/assets/bundles/icons/weapon/攻速4.png differ diff --git a/assets/bundles/icons/weapon/攻速4.png.meta b/assets/bundles/icons/weapon/攻速4.png.meta index dfccf15..78bd349 100644 --- a/assets/bundles/icons/weapon/攻速4.png.meta +++ b/assets/bundles/icons/weapon/攻速4.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "3de84aeb-064a-4877-8b08-375b196f8d5f", + "uuid": "c9516f86-962d-4fb5-92a8-b3489b030d8c", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "3de84aeb-064a-4877-8b08-375b196f8d5f@6c48a", + "uuid": "c9516f86-962d-4fb5-92a8-b3489b030d8c@6c48a", "displayName": "攻速4", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "3de84aeb-064a-4877-8b08-375b196f8d5f", + "imageUuidOrDatabaseUri": "c9516f86-962d-4fb5-92a8-b3489b030d8c", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,19 +34,19 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "3de84aeb-064a-4877-8b08-375b196f8d5f@f9941", + "uuid": "c9516f86-962d-4fb5-92a8-b3489b030d8c@f9941", "displayName": "攻速4", "id": "f9941", "name": "spriteFrame", "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -0.5, "offsetY": 0.5, - "trimX": 22, - "trimY": 21, - "width": 156, - "height": 157, + "trimX": 25, + "trimY": 25, + "width": 149, + "height": 149, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -78, - -78.5, + -74.5, + -74.5, 0, - 78, - -78.5, + 74.5, + -74.5, 0, - -78, - 78.5, + -74.5, + 74.5, 0, - 78, - 78.5, + 74.5, + 74.5, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 22, - 179, - 178, - 179, - 22, - 22, - 178, - 22 + 25, + 175, + 174, + 175, + 25, + 26, + 174, + 26 ], "nuv": [ - 0.11, - 0.11, - 0.89, - 0.11, - 0.11, - 0.895, - 0.89, - 0.895 + 0.125, + 0.13, + 0.87, + 0.13, + 0.125, + 0.875, + 0.87, + 0.875 ], "minPos": [ - -78, - -78.5, + -74.5, + -74.5, 0 ], "maxPos": [ - 78, - 78.5, + 74.5, + 74.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "3de84aeb-064a-4877-8b08-375b196f8d5f@6c48a", + "imageUuidOrDatabaseUri": "c9516f86-962d-4fb5-92a8-b3489b030d8c@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "3de84aeb-064a-4877-8b08-375b196f8d5f@6c48a" + "redirect": "c9516f86-962d-4fb5-92a8-b3489b030d8c@6c48a" } } diff --git a/assets/bundles/icons/weapon/攻速5.png b/assets/bundles/icons/weapon/攻速5.png index 141ca54..355f0fa 100644 Binary files a/assets/bundles/icons/weapon/攻速5.png and b/assets/bundles/icons/weapon/攻速5.png differ diff --git a/assets/bundles/icons/weapon/攻速5.png.meta b/assets/bundles/icons/weapon/攻速5.png.meta index b79e09f..5d37557 100644 --- a/assets/bundles/icons/weapon/攻速5.png.meta +++ b/assets/bundles/icons/weapon/攻速5.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "518b4420-061a-42d1-accf-75dfc81203a0", + "uuid": "1f4a24db-8223-461d-91df-d860ca3473da", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "518b4420-061a-42d1-accf-75dfc81203a0@6c48a", + "uuid": "1f4a24db-8223-461d-91df-d860ca3473da@6c48a", "displayName": "攻速5", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "518b4420-061a-42d1-accf-75dfc81203a0", + "imageUuidOrDatabaseUri": "1f4a24db-8223-461d-91df-d860ca3473da", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,7 +34,7 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "518b4420-061a-42d1-accf-75dfc81203a0@f9941", + "uuid": "1f4a24db-8223-461d-91df-d860ca3473da@f9941", "displayName": "攻速5", "id": "f9941", "name": "spriteFrame", @@ -43,10 +43,10 @@ "rotated": false, "offsetX": -0.5, "offsetY": 0.5, - "trimX": 17, - "trimY": 18, - "width": 165, - "height": 163, + "trimX": 25, + "trimY": 25, + "width": 149, + "height": 149, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -82.5, - -81.5, + -74.5, + -74.5, 0, - 82.5, - -81.5, + 74.5, + -74.5, 0, - -82.5, - 81.5, + -74.5, + 74.5, 0, - 82.5, - 81.5, + 74.5, + 74.5, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 17, - 182, - 182, - 182, - 17, - 19, - 182, - 19 + 25, + 175, + 174, + 175, + 25, + 26, + 174, + 26 ], "nuv": [ - 0.085, - 0.095, - 0.91, - 0.095, - 0.085, - 0.91, - 0.91, - 0.91 + 0.125, + 0.13, + 0.87, + 0.13, + 0.125, + 0.875, + 0.87, + 0.875 ], "minPos": [ - -82.5, - -81.5, + -74.5, + -74.5, 0 ], "maxPos": [ - 82.5, - 81.5, + 74.5, + 74.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "518b4420-061a-42d1-accf-75dfc81203a0@6c48a", + "imageUuidOrDatabaseUri": "1f4a24db-8223-461d-91df-d860ca3473da@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "518b4420-061a-42d1-accf-75dfc81203a0@6c48a" + "redirect": "1f4a24db-8223-461d-91df-d860ca3473da@6c48a" } } diff --git a/assets/bundles/icons/weapon/暴击1.png b/assets/bundles/icons/weapon/暴击1.png index 0c7a5df..a3122dc 100644 Binary files a/assets/bundles/icons/weapon/暴击1.png and b/assets/bundles/icons/weapon/暴击1.png differ diff --git a/assets/bundles/icons/weapon/暴击1.png.meta b/assets/bundles/icons/weapon/暴击1.png.meta index 60ad88b..b927541 100644 --- a/assets/bundles/icons/weapon/暴击1.png.meta +++ b/assets/bundles/icons/weapon/暴击1.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": -0.5, + "offsetX": 0, "offsetY": 0, - "trimX": 25, - "trimY": 34, - "width": 149, - "height": 132, + "trimX": 39, + "trimY": 23, + "width": 122, + "height": 154, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -74.5, - -66, + -61, + -77, 0, - 74.5, - -66, + 61, + -77, 0, - -74.5, - 66, + -61, + 77, 0, - 74.5, - 66, + 61, + 77, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 25, - 166, - 174, - 166, - 25, - 34, - 174, - 34 + 39, + 177, + 161, + 177, + 39, + 23, + 161, + 23 ], "nuv": [ - 0.125, - 0.17, - 0.87, - 0.17, - 0.125, - 0.83, - 0.87, - 0.83 + 0.195, + 0.115, + 0.805, + 0.115, + 0.195, + 0.885, + 0.805, + 0.885 ], "minPos": [ - -74.5, - -66, + -61, + -77, 0 ], "maxPos": [ - 74.5, - 66, + 61, + 77, 0 ] }, diff --git a/assets/bundles/icons/weapon/暴击2.png b/assets/bundles/icons/weapon/暴击2.png index 52768a9..4dbae03 100644 Binary files a/assets/bundles/icons/weapon/暴击2.png and b/assets/bundles/icons/weapon/暴击2.png differ diff --git a/assets/bundles/icons/weapon/暴击2.png.meta b/assets/bundles/icons/weapon/暴击2.png.meta index 24a6946..4470c63 100644 --- a/assets/bundles/icons/weapon/暴击2.png.meta +++ b/assets/bundles/icons/weapon/暴击2.png.meta @@ -43,10 +43,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0.5, - "trimX": 19, - "trimY": 18, - "width": 162, - "height": 163, + "trimX": 38, + "trimY": 20, + "width": 124, + "height": 159, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -81, - -81.5, + -62, + -79.5, 0, - 81, - -81.5, + 62, + -79.5, 0, - -81, - 81.5, + -62, + 79.5, 0, - 81, - 81.5, + 62, + 79.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 19, - 182, - 181, - 182, - 19, - 19, - 181, - 19 + 38, + 180, + 162, + 180, + 38, + 21, + 162, + 21 ], "nuv": [ - 0.095, - 0.095, - 0.905, - 0.095, - 0.095, - 0.91, - 0.905, - 0.91 + 0.19, + 0.105, + 0.81, + 0.105, + 0.19, + 0.9, + 0.81, + 0.9 ], "minPos": [ - -81, - -81.5, + -62, + -79.5, 0 ], "maxPos": [ - 81, - 81.5, + 62, + 79.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/暴击3.png b/assets/bundles/icons/weapon/暴击3.png index 252e3ec..b608e7b 100644 Binary files a/assets/bundles/icons/weapon/暴击3.png and b/assets/bundles/icons/weapon/暴击3.png differ diff --git a/assets/bundles/icons/weapon/暴击3.png.meta b/assets/bundles/icons/weapon/暴击3.png.meta index d39a652..3c9fc91 100644 --- a/assets/bundles/icons/weapon/暴击3.png.meta +++ b/assets/bundles/icons/weapon/暴击3.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": -0.5, + "offsetX": 0, "offsetY": 0, - "trimX": 30, - "trimY": 18, - "width": 139, - "height": 164, + "trimX": 39, + "trimY": 23, + "width": 122, + "height": 154, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -69.5, - -82, + -61, + -77, 0, - 69.5, - -82, + 61, + -77, 0, - -69.5, - 82, + -61, + 77, 0, - 69.5, - 82, + 61, + 77, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 30, - 182, - 169, - 182, - 30, - 18, - 169, - 18 + 39, + 177, + 161, + 177, + 39, + 23, + 161, + 23 ], "nuv": [ - 0.15, - 0.09, - 0.845, - 0.09, - 0.15, - 0.91, - 0.845, - 0.91 + 0.195, + 0.115, + 0.805, + 0.115, + 0.195, + 0.885, + 0.805, + 0.885 ], "minPos": [ - -69.5, - -82, + -61, + -77, 0 ], "maxPos": [ - 69.5, - 82, + 61, + 77, 0 ] }, diff --git a/assets/bundles/icons/weapon/暴击4.png b/assets/bundles/icons/weapon/暴击4.png index fbe8c97..0df62db 100644 Binary files a/assets/bundles/icons/weapon/暴击4.png and b/assets/bundles/icons/weapon/暴击4.png differ diff --git a/assets/bundles/icons/weapon/暴击4.png.meta b/assets/bundles/icons/weapon/暴击4.png.meta index 0455adc..f269e78 100644 --- a/assets/bundles/icons/weapon/暴击4.png.meta +++ b/assets/bundles/icons/weapon/暴击4.png.meta @@ -43,10 +43,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0.5, - "trimX": 22, - "trimY": 21, - "width": 156, - "height": 157, + "trimX": 35, + "trimY": 17, + "width": 130, + "height": 165, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -78, - -78.5, + -65, + -82.5, 0, - 78, - -78.5, + 65, + -82.5, 0, - -78, - 78.5, + -65, + 82.5, 0, - 78, - 78.5, + 65, + 82.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 22, - 179, - 178, - 179, - 22, - 22, - 178, - 22 + 35, + 183, + 165, + 183, + 35, + 18, + 165, + 18 ], "nuv": [ - 0.11, - 0.11, - 0.89, - 0.11, - 0.11, - 0.895, - 0.89, - 0.895 + 0.175, + 0.09, + 0.825, + 0.09, + 0.175, + 0.915, + 0.825, + 0.915 ], "minPos": [ - -78, - -78.5, + -65, + -82.5, 0 ], "maxPos": [ - 78, - 78.5, + 65, + 82.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/暴击5.png b/assets/bundles/icons/weapon/暴击5.png index 195862b..35b4760 100644 Binary files a/assets/bundles/icons/weapon/暴击5.png and b/assets/bundles/icons/weapon/暴击5.png differ diff --git a/assets/bundles/icons/weapon/暴击5.png.meta b/assets/bundles/icons/weapon/暴击5.png.meta index ac6a075..bdfd4d5 100644 --- a/assets/bundles/icons/weapon/暴击5.png.meta +++ b/assets/bundles/icons/weapon/暴击5.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": -0.5, + "offsetX": 0, "offsetY": 0.5, - "trimX": 17, - "trimY": 18, - "width": 165, - "height": 163, + "trimX": 35, + "trimY": 17, + "width": 130, + "height": 165, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ + -65, -82.5, - -81.5, - 0, - 82.5, - -81.5, 0, + 65, -82.5, - 81.5, 0, + -65, + 82.5, + 0, + 65, 82.5, - 81.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 17, - 182, - 182, - 182, - 17, - 19, - 182, - 19 + 35, + 183, + 165, + 183, + 35, + 18, + 165, + 18 ], "nuv": [ - 0.085, - 0.095, - 0.91, - 0.095, - 0.085, - 0.91, - 0.91, - 0.91 + 0.175, + 0.09, + 0.825, + 0.09, + 0.175, + 0.915, + 0.825, + 0.915 ], "minPos": [ + -65, -82.5, - -81.5, 0 ], "maxPos": [ + 65, 82.5, - 81.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/暴风雪2.png b/assets/bundles/icons/weapon/暴风雪2.png index 9ae5399..5c852e2 100644 Binary files a/assets/bundles/icons/weapon/暴风雪2.png and b/assets/bundles/icons/weapon/暴风雪2.png differ diff --git a/assets/bundles/icons/weapon/暴风雪2.png.meta b/assets/bundles/icons/weapon/暴风雪2.png.meta index 3a98f9d..d7339a6 100644 --- a/assets/bundles/icons/weapon/暴风雪2.png.meta +++ b/assets/bundles/icons/weapon/暴风雪2.png.meta @@ -41,11 +41,11 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -0.5, "offsetY": 0, - "trimX": 22, + "trimX": 21, "trimY": 27, - "width": 156, + "width": 157, "height": 146, "rawWidth": 200, "rawHeight": 200, @@ -60,16 +60,16 @@ "meshType": 0, "vertices": { "rawPosition": [ - -78, + -78.5, -73, 0, - 78, + 78.5, -73, 0, - -78, + -78.5, 73, 0, - 78, + 78.5, 73, 0 ], @@ -82,32 +82,32 @@ 3 ], "uv": [ - 22, + 21, 173, 178, 173, - 22, + 21, 27, 178, 27 ], "nuv": [ - 0.11, + 0.105, 0.135, 0.89, 0.135, - 0.11, + 0.105, 0.865, 0.89, 0.865 ], "minPos": [ - -78, + -78.5, -73, 0 ], "maxPos": [ - 78, + 78.5, 73, 0 ] diff --git a/assets/bundles/icons/weapon/暴风雪3.png b/assets/bundles/icons/weapon/暴风雪3.png index 6613433..aa6e786 100644 Binary files a/assets/bundles/icons/weapon/暴风雪3.png and b/assets/bundles/icons/weapon/暴风雪3.png differ diff --git a/assets/bundles/icons/weapon/暴风雪3.png.meta b/assets/bundles/icons/weapon/暴风雪3.png.meta index 5ad4461..3b3f1af 100644 --- a/assets/bundles/icons/weapon/暴风雪3.png.meta +++ b/assets/bundles/icons/weapon/暴风雪3.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -0.5, "offsetY": 0, - "trimX": 19, - "trimY": 26, - "width": 162, - "height": 148, + "trimX": 20, + "trimY": 24, + "width": 159, + "height": 152, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -81, - -74, + -79.5, + -76, 0, - 81, - -74, + 79.5, + -76, 0, - -81, - 74, + -79.5, + 76, 0, - 81, - 74, + 79.5, + 76, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 19, - 174, - 181, - 174, - 19, - 26, - 181, - 26 + 20, + 176, + 179, + 176, + 20, + 24, + 179, + 24 ], "nuv": [ - 0.095, - 0.13, - 0.905, - 0.13, - 0.095, - 0.87, - 0.905, - 0.87 + 0.1, + 0.12, + 0.895, + 0.12, + 0.1, + 0.88, + 0.895, + 0.88 ], "minPos": [ - -81, - -74, + -79.5, + -76, 0 ], "maxPos": [ - 81, - 74, + 79.5, + 76, 0 ] }, diff --git a/assets/bundles/icons/weapon/暴风雪4.png b/assets/bundles/icons/weapon/暴风雪4.png index 101e3d6..a466a4e 100644 Binary files a/assets/bundles/icons/weapon/暴风雪4.png and b/assets/bundles/icons/weapon/暴风雪4.png differ diff --git a/assets/bundles/icons/weapon/暴风雪4.png.meta b/assets/bundles/icons/weapon/暴风雪4.png.meta index 655e3ed..1dc7995 100644 --- a/assets/bundles/icons/weapon/暴风雪4.png.meta +++ b/assets/bundles/icons/weapon/暴风雪4.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0.5, - "trimX": 7, + "offsetX": -0.5, + "offsetY": 0, + "trimX": 13, "trimY": 22, - "width": 186, - "height": 155, + "width": 173, + "height": 156, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -93, - -77.5, + -86.5, + -78, 0, - 93, - -77.5, + 86.5, + -78, 0, - -93, - 77.5, + -86.5, + 78, 0, - 93, - 77.5, + 86.5, + 78, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 7, + 13, 178, - 193, + 186, 178, - 7, - 23, - 193, - 23 + 13, + 22, + 186, + 22 ], "nuv": [ - 0.035, - 0.115, - 0.965, - 0.115, - 0.035, + 0.065, + 0.11, + 0.93, + 0.11, + 0.065, 0.89, - 0.965, + 0.93, 0.89 ], "minPos": [ - -93, - -77.5, + -86.5, + -78, 0 ], "maxPos": [ - 93, - 77.5, + 86.5, + 78, 0 ] }, diff --git a/assets/bundles/icons/weapon/暴风雪5.png b/assets/bundles/icons/weapon/暴风雪5.png index 2d46956..560cf3a 100644 Binary files a/assets/bundles/icons/weapon/暴风雪5.png and b/assets/bundles/icons/weapon/暴风雪5.png differ diff --git a/assets/bundles/icons/weapon/暴风雪5.png.meta b/assets/bundles/icons/weapon/暴风雪5.png.meta index 1765ef4..619201f 100644 --- a/assets/bundles/icons/weapon/暴风雪5.png.meta +++ b/assets/bundles/icons/weapon/暴风雪5.png.meta @@ -43,10 +43,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 2, - "trimY": 23, - "width": 196, - "height": 154, + "trimX": 13, + "trimY": 19, + "width": 174, + "height": 162, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -98, - -77, + -87, + -81, 0, - 98, - -77, + 87, + -81, 0, - -98, - 77, + -87, + 81, 0, - 98, - 77, + 87, + 81, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 2, - 177, - 198, - 177, - 2, - 23, - 198, - 23 + 13, + 181, + 187, + 181, + 13, + 19, + 187, + 19 ], "nuv": [ - 0.01, - 0.115, - 0.99, - 0.115, - 0.01, - 0.885, - 0.99, - 0.885 + 0.065, + 0.095, + 0.935, + 0.095, + 0.065, + 0.905, + 0.935, + 0.905 ], "minPos": [ - -98, - -77, + -87, + -81, 0 ], "maxPos": [ - 98, - 77, + 87, + 81, 0 ] }, diff --git a/assets/bundles/icons/weapon/火龙击2.png b/assets/bundles/icons/weapon/火龙击2.png index bbadea6..4ffe7eb 100644 Binary files a/assets/bundles/icons/weapon/火龙击2.png and b/assets/bundles/icons/weapon/火龙击2.png differ diff --git a/assets/bundles/icons/weapon/火龙击2.png.meta b/assets/bundles/icons/weapon/火龙击2.png.meta index c264358..ec83a41 100644 --- a/assets/bundles/icons/weapon/火龙击2.png.meta +++ b/assets/bundles/icons/weapon/火龙击2.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "b63d998b-887f-4692-b42e-e2a07e22b556", + "uuid": "2621c973-c511-4475-bd06-56c91991e56c", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "b63d998b-887f-4692-b42e-e2a07e22b556@6c48a", + "uuid": "2621c973-c511-4475-bd06-56c91991e56c@6c48a", "displayName": "火龙击2", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "b63d998b-887f-4692-b42e-e2a07e22b556", + "imageUuidOrDatabaseUri": "2621c973-c511-4475-bd06-56c91991e56c", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,7 +34,7 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "b63d998b-887f-4692-b42e-e2a07e22b556@f9941", + "uuid": "2621c973-c511-4475-bd06-56c91991e56c@f9941", "displayName": "火龙击2", "id": "f9941", "name": "spriteFrame", @@ -42,11 +42,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": -0.5, - "offsetY": 0.5, - "trimX": 23, - "trimY": 26, - "width": 153, - "height": 147, + "offsetY": 0, + "trimX": 17, + "trimY": 27, + "width": 165, + "height": 146, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -76.5, - -73.5, + -82.5, + -73, 0, - 76.5, - -73.5, + 82.5, + -73, 0, - -76.5, - 73.5, + -82.5, + 73, 0, - 76.5, - 73.5, + 82.5, + 73, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 23, - 174, - 176, - 174, - 23, + 17, + 173, + 182, + 173, + 17, 27, - 176, + 182, 27 ], "nuv": [ - 0.115, + 0.085, 0.135, - 0.88, + 0.91, 0.135, - 0.115, - 0.87, - 0.88, - 0.87 + 0.085, + 0.865, + 0.91, + 0.865 ], "minPos": [ - -76.5, - -73.5, + -82.5, + -73, 0 ], "maxPos": [ - 76.5, - 73.5, + 82.5, + 73, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "b63d998b-887f-4692-b42e-e2a07e22b556@6c48a", + "imageUuidOrDatabaseUri": "2621c973-c511-4475-bd06-56c91991e56c@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "b63d998b-887f-4692-b42e-e2a07e22b556@6c48a" + "redirect": "2621c973-c511-4475-bd06-56c91991e56c@6c48a" } } diff --git a/assets/bundles/icons/weapon/火龙击3.png b/assets/bundles/icons/weapon/火龙击3.png index 665e8e5..7d4556f 100644 Binary files a/assets/bundles/icons/weapon/火龙击3.png and b/assets/bundles/icons/weapon/火龙击3.png differ diff --git a/assets/bundles/icons/weapon/火龙击3.png.meta b/assets/bundles/icons/weapon/火龙击3.png.meta index 03de236..2cea493 100644 --- a/assets/bundles/icons/weapon/火龙击3.png.meta +++ b/assets/bundles/icons/weapon/火龙击3.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "453e236b-b4bc-46eb-a05b-e10127d7d445", + "uuid": "e9deeea9-a78e-4ee3-8bf6-b7cb6bf812aa", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "453e236b-b4bc-46eb-a05b-e10127d7d445@6c48a", + "uuid": "e9deeea9-a78e-4ee3-8bf6-b7cb6bf812aa@6c48a", "displayName": "火龙击3", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "453e236b-b4bc-46eb-a05b-e10127d7d445", + "imageUuidOrDatabaseUri": "e9deeea9-a78e-4ee3-8bf6-b7cb6bf812aa", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,7 +34,7 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "453e236b-b4bc-46eb-a05b-e10127d7d445@f9941", + "uuid": "e9deeea9-a78e-4ee3-8bf6-b7cb6bf812aa@f9941", "displayName": "火龙击3", "id": "f9941", "name": "spriteFrame", @@ -42,11 +42,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0.5, - "trimX": 9, - "trimY": 23, - "width": 182, - "height": 153, + "offsetY": 0, + "trimX": 16, + "trimY": 26, + "width": 168, + "height": 148, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -91, - -76.5, + -84, + -74, 0, - 91, - -76.5, + 84, + -74, 0, - -91, - 76.5, + -84, + 74, 0, - 91, - 76.5, + 84, + 74, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 9, - 177, - 191, - 177, - 9, - 24, - 191, - 24 + 16, + 174, + 184, + 174, + 16, + 26, + 184, + 26 ], "nuv": [ - 0.045, - 0.12, - 0.955, - 0.12, - 0.045, - 0.885, - 0.955, - 0.885 + 0.08, + 0.13, + 0.92, + 0.13, + 0.08, + 0.87, + 0.92, + 0.87 ], "minPos": [ - -91, - -76.5, + -84, + -74, 0 ], "maxPos": [ - 91, - 76.5, + 84, + 74, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "453e236b-b4bc-46eb-a05b-e10127d7d445@6c48a", + "imageUuidOrDatabaseUri": "e9deeea9-a78e-4ee3-8bf6-b7cb6bf812aa@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "453e236b-b4bc-46eb-a05b-e10127d7d445@6c48a" + "redirect": "e9deeea9-a78e-4ee3-8bf6-b7cb6bf812aa@6c48a" } } diff --git a/assets/bundles/icons/weapon/火龙击4.png b/assets/bundles/icons/weapon/火龙击4.png index 7c79563..ee71532 100644 Binary files a/assets/bundles/icons/weapon/火龙击4.png and b/assets/bundles/icons/weapon/火龙击4.png differ diff --git a/assets/bundles/icons/weapon/火龙击4.png.meta b/assets/bundles/icons/weapon/火龙击4.png.meta index e1720b3..c9ecf81 100644 --- a/assets/bundles/icons/weapon/火龙击4.png.meta +++ b/assets/bundles/icons/weapon/火龙击4.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "0bcedb65-2df0-41fe-ab9e-16c2f9e54156", + "uuid": "f99f922f-2653-4235-9504-0a6c2a8d61ec", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "0bcedb65-2df0-41fe-ab9e-16c2f9e54156@6c48a", + "uuid": "f99f922f-2653-4235-9504-0a6c2a8d61ec@6c48a", "displayName": "火龙击4", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "0bcedb65-2df0-41fe-ab9e-16c2f9e54156", + "imageUuidOrDatabaseUri": "f99f922f-2653-4235-9504-0a6c2a8d61ec", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,7 +34,7 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "0bcedb65-2df0-41fe-ab9e-16c2f9e54156@f9941", + "uuid": "f99f922f-2653-4235-9504-0a6c2a8d61ec@f9941", "displayName": "火龙击4", "id": "f9941", "name": "spriteFrame", @@ -43,10 +43,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 13, - "trimY": 19, - "width": 174, - "height": 162, + "trimX": 10, + "trimY": 22, + "width": 180, + "height": 156, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -87, - -81, + -90, + -78, 0, - 87, - -81, + 90, + -78, 0, - -87, - 81, + -90, + 78, 0, - 87, - 81, + 90, + 78, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 13, - 181, - 187, - 181, - 13, - 19, - 187, - 19 + 10, + 178, + 190, + 178, + 10, + 22, + 190, + 22 ], "nuv": [ - 0.065, - 0.095, - 0.935, - 0.095, - 0.065, - 0.905, - 0.935, - 0.905 + 0.05, + 0.11, + 0.95, + 0.11, + 0.05, + 0.89, + 0.95, + 0.89 ], "minPos": [ - -87, - -81, + -90, + -78, 0 ], "maxPos": [ - 87, - 81, + 90, + 78, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "0bcedb65-2df0-41fe-ab9e-16c2f9e54156@6c48a", + "imageUuidOrDatabaseUri": "f99f922f-2653-4235-9504-0a6c2a8d61ec@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "0bcedb65-2df0-41fe-ab9e-16c2f9e54156@6c48a" + "redirect": "f99f922f-2653-4235-9504-0a6c2a8d61ec@6c48a" } } diff --git a/assets/bundles/icons/weapon/火龙击5.png b/assets/bundles/icons/weapon/火龙击5.png index 72aa2d2..329a1f9 100644 Binary files a/assets/bundles/icons/weapon/火龙击5.png and b/assets/bundles/icons/weapon/火龙击5.png differ diff --git a/assets/bundles/icons/weapon/火龙击5.png.meta b/assets/bundles/icons/weapon/火龙击5.png.meta index 48a9037..10d0003 100644 --- a/assets/bundles/icons/weapon/火龙击5.png.meta +++ b/assets/bundles/icons/weapon/火龙击5.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "317fbc5d-cb9a-4e74-88de-1a2dc58c8db9", + "uuid": "84b224b8-db02-4335-a599-1f7e1d63456b", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "317fbc5d-cb9a-4e74-88de-1a2dc58c8db9@6c48a", + "uuid": "84b224b8-db02-4335-a599-1f7e1d63456b@6c48a", "displayName": "火龙击5", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "317fbc5d-cb9a-4e74-88de-1a2dc58c8db9", + "imageUuidOrDatabaseUri": "84b224b8-db02-4335-a599-1f7e1d63456b", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,19 +34,19 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "317fbc5d-cb9a-4e74-88de-1a2dc58c8db9@f9941", + "uuid": "84b224b8-db02-4335-a599-1f7e1d63456b@f9941", "displayName": "火龙击5", "id": "f9941", "name": "spriteFrame", "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0.5, - "trimX": 14, - "trimY": 4, - "width": 172, - "height": 191, + "offsetX": -0.5, + "offsetY": 0, + "trimX": 10, + "trimY": 17, + "width": 179, + "height": 166, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -86, - -95.5, + -89.5, + -83, 0, - 86, - -95.5, + 89.5, + -83, 0, - -86, - 95.5, + -89.5, + 83, 0, - 86, - 95.5, + 89.5, + 83, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 14, - 196, - 186, - 196, - 14, - 5, - 186, - 5 + 10, + 183, + 189, + 183, + 10, + 17, + 189, + 17 ], "nuv": [ - 0.07, - 0.025, - 0.93, - 0.025, - 0.07, - 0.98, - 0.93, - 0.98 + 0.05, + 0.085, + 0.945, + 0.085, + 0.05, + 0.915, + 0.945, + 0.915 ], "minPos": [ - -86, - -95.5, + -89.5, + -83, 0 ], "maxPos": [ - 86, - 95.5, + 89.5, + 83, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "317fbc5d-cb9a-4e74-88de-1a2dc58c8db9@6c48a", + "imageUuidOrDatabaseUri": "84b224b8-db02-4335-a599-1f7e1d63456b@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "317fbc5d-cb9a-4e74-88de-1a2dc58c8db9@6c48a" + "redirect": "84b224b8-db02-4335-a599-1f7e1d63456b@6c48a" } } diff --git a/assets/bundles/icons/weapon/燃烧1.png b/assets/bundles/icons/weapon/燃烧1.png index fdbbf02..8f7984d 100644 Binary files a/assets/bundles/icons/weapon/燃烧1.png and b/assets/bundles/icons/weapon/燃烧1.png differ diff --git a/assets/bundles/icons/weapon/燃烧1.png.meta b/assets/bundles/icons/weapon/燃烧1.png.meta index 8c88dd7..c8974a2 100644 --- a/assets/bundles/icons/weapon/燃烧1.png.meta +++ b/assets/bundles/icons/weapon/燃烧1.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -0.5, "offsetY": 0.5, - "trimX": 18, - "trimY": 23, - "width": 164, - "height": 153, + "trimX": 30, + "trimY": 43, + "width": 139, + "height": 113, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -82, - -76.5, + -69.5, + -56.5, 0, - 82, - -76.5, + 69.5, + -56.5, 0, - -82, - 76.5, + -69.5, + 56.5, 0, - 82, - 76.5, + 69.5, + 56.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 18, - 177, - 182, - 177, - 18, - 24, - 182, - 24 + 30, + 157, + 169, + 157, + 30, + 44, + 169, + 44 ], "nuv": [ - 0.09, - 0.12, - 0.91, - 0.12, - 0.09, - 0.885, - 0.91, - 0.885 + 0.15, + 0.22, + 0.845, + 0.22, + 0.15, + 0.785, + 0.845, + 0.785 ], "minPos": [ - -82, - -76.5, + -69.5, + -56.5, 0 ], "maxPos": [ - 82, - 76.5, + 69.5, + 56.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/燃烧2.png b/assets/bundles/icons/weapon/燃烧2.png index 8a4e7b0..17cc8d9 100644 Binary files a/assets/bundles/icons/weapon/燃烧2.png and b/assets/bundles/icons/weapon/燃烧2.png differ diff --git a/assets/bundles/icons/weapon/燃烧2.png.meta b/assets/bundles/icons/weapon/燃烧2.png.meta index 0925c7f..c08b8ae 100644 --- a/assets/bundles/icons/weapon/燃烧2.png.meta +++ b/assets/bundles/icons/weapon/燃烧2.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": -0.5, - "offsetY": 0.5, - "trimX": 23, - "trimY": 26, - "width": 153, - "height": 147, + "offsetX": 0, + "offsetY": 0, + "trimX": 29, + "trimY": 37, + "width": 142, + "height": 126, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -76.5, - -73.5, + -71, + -63, 0, - 76.5, - -73.5, + 71, + -63, 0, - -76.5, - 73.5, + -71, + 63, 0, - 76.5, - 73.5, + 71, + 63, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 23, - 174, - 176, - 174, - 23, - 27, - 176, - 27 + 29, + 163, + 171, + 163, + 29, + 37, + 171, + 37 ], "nuv": [ - 0.115, - 0.135, - 0.88, - 0.135, - 0.115, - 0.87, - 0.88, - 0.87 + 0.145, + 0.185, + 0.855, + 0.185, + 0.145, + 0.815, + 0.855, + 0.815 ], "minPos": [ - -76.5, - -73.5, + -71, + -63, 0 ], "maxPos": [ - 76.5, - 73.5, + 71, + 63, 0 ] }, diff --git a/assets/bundles/icons/weapon/燃烧3.png b/assets/bundles/icons/weapon/燃烧3.png index f4fdf22..afd2a1e 100644 Binary files a/assets/bundles/icons/weapon/燃烧3.png and b/assets/bundles/icons/weapon/燃烧3.png differ diff --git a/assets/bundles/icons/weapon/燃烧3.png.meta b/assets/bundles/icons/weapon/燃烧3.png.meta index 7a3a24a..3fe496d 100644 --- a/assets/bundles/icons/weapon/燃烧3.png.meta +++ b/assets/bundles/icons/weapon/燃烧3.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -0.5, "offsetY": 0.5, - "trimX": 9, - "trimY": 23, - "width": 182, - "height": 153, + "trimX": 26, + "trimY": 30, + "width": 147, + "height": 139, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -91, - -76.5, + -73.5, + -69.5, 0, - 91, - -76.5, + 73.5, + -69.5, 0, - -91, - 76.5, + -73.5, + 69.5, 0, - 91, - 76.5, + 73.5, + 69.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 9, - 177, - 191, - 177, - 9, - 24, - 191, - 24 + 26, + 170, + 173, + 170, + 26, + 31, + 173, + 31 ], "nuv": [ - 0.045, - 0.12, - 0.955, - 0.12, - 0.045, - 0.885, - 0.955, - 0.885 + 0.13, + 0.155, + 0.865, + 0.155, + 0.13, + 0.85, + 0.865, + 0.85 ], "minPos": [ - -91, - -76.5, + -73.5, + -69.5, 0 ], "maxPos": [ - 91, - 76.5, + 73.5, + 69.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/燃烧4.png b/assets/bundles/icons/weapon/燃烧4.png index 388ef48..3b466c7 100644 Binary files a/assets/bundles/icons/weapon/燃烧4.png and b/assets/bundles/icons/weapon/燃烧4.png differ diff --git a/assets/bundles/icons/weapon/燃烧4.png.meta b/assets/bundles/icons/weapon/燃烧4.png.meta index 9820fc4..721503b 100644 --- a/assets/bundles/icons/weapon/燃烧4.png.meta +++ b/assets/bundles/icons/weapon/燃烧4.png.meta @@ -43,10 +43,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 13, - "trimY": 19, - "width": 174, - "height": 162, + "trimX": 24, + "trimY": 27, + "width": 152, + "height": 146, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -87, - -81, + -76, + -73, 0, - 87, - -81, + 76, + -73, 0, - -87, - 81, + -76, + 73, 0, - 87, - 81, + 76, + 73, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 13, - 181, - 187, - 181, - 13, - 19, - 187, - 19 + 24, + 173, + 176, + 173, + 24, + 27, + 176, + 27 ], "nuv": [ - 0.065, - 0.095, - 0.935, - 0.095, - 0.065, - 0.905, - 0.935, - 0.905 + 0.12, + 0.135, + 0.88, + 0.135, + 0.12, + 0.865, + 0.88, + 0.865 ], "minPos": [ - -87, - -81, + -76, + -73, 0 ], "maxPos": [ - 87, - 81, + 76, + 73, 0 ] }, diff --git a/assets/bundles/icons/weapon/燃烧5.png b/assets/bundles/icons/weapon/燃烧5.png index 142f7f0..819de24 100644 Binary files a/assets/bundles/icons/weapon/燃烧5.png and b/assets/bundles/icons/weapon/燃烧5.png differ diff --git a/assets/bundles/icons/weapon/燃烧5.png.meta b/assets/bundles/icons/weapon/燃烧5.png.meta index ab274f9..08f199e 100644 --- a/assets/bundles/icons/weapon/燃烧5.png.meta +++ b/assets/bundles/icons/weapon/燃烧5.png.meta @@ -42,11 +42,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0.5, - "trimX": 14, - "trimY": 4, - "width": 172, - "height": 191, + "offsetY": 0, + "trimX": 16, + "trimY": 29, + "width": 168, + "height": 142, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -86, - -95.5, + -84, + -71, 0, - 86, - -95.5, + 84, + -71, 0, - -86, - 95.5, + -84, + 71, 0, - 86, - 95.5, + 84, + 71, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 14, - 196, - 186, - 196, - 14, - 5, - 186, - 5 + 16, + 171, + 184, + 171, + 16, + 29, + 184, + 29 ], "nuv": [ - 0.07, - 0.025, - 0.93, - 0.025, - 0.07, - 0.98, - 0.93, - 0.98 + 0.08, + 0.145, + 0.92, + 0.145, + 0.08, + 0.855, + 0.92, + 0.855 ], "minPos": [ - -86, - -95.5, + -84, + -71, 0 ], "maxPos": [ - 86, - 95.5, + 84, + 71, 0 ] }, diff --git a/assets/bundles/icons/weapon/爆伤1.png b/assets/bundles/icons/weapon/爆伤1.png index 5bc1af1..a67f8ff 100644 Binary files a/assets/bundles/icons/weapon/爆伤1.png and b/assets/bundles/icons/weapon/爆伤1.png differ diff --git a/assets/bundles/icons/weapon/爆伤1.png.meta b/assets/bundles/icons/weapon/爆伤1.png.meta index 99464a2..8670050 100644 --- a/assets/bundles/icons/weapon/爆伤1.png.meta +++ b/assets/bundles/icons/weapon/爆伤1.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": -0.5, + "offsetX": 0, "offsetY": 0, - "trimX": 25, - "trimY": 34, - "width": 149, - "height": 132, + "trimX": 36, + "trimY": 27, + "width": 128, + "height": 146, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -74.5, - -66, + -64, + -73, 0, - 74.5, - -66, + 64, + -73, 0, - -74.5, - 66, + -64, + 73, 0, - 74.5, - 66, + 64, + 73, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 25, - 166, - 174, - 166, - 25, - 34, - 174, - 34 + 36, + 173, + 164, + 173, + 36, + 27, + 164, + 27 ], "nuv": [ - 0.125, - 0.17, - 0.87, - 0.17, - 0.125, - 0.83, - 0.87, - 0.83 + 0.18, + 0.135, + 0.82, + 0.135, + 0.18, + 0.865, + 0.82, + 0.865 ], "minPos": [ - -74.5, - -66, + -64, + -73, 0 ], "maxPos": [ - 74.5, - 66, + 64, + 73, 0 ] }, diff --git a/assets/bundles/icons/weapon/爆伤2.png b/assets/bundles/icons/weapon/爆伤2.png index b027a6c..2595d7e 100644 Binary files a/assets/bundles/icons/weapon/爆伤2.png and b/assets/bundles/icons/weapon/爆伤2.png differ diff --git a/assets/bundles/icons/weapon/爆伤2.png.meta b/assets/bundles/icons/weapon/爆伤2.png.meta index 27d1daf..afb2f7a 100644 --- a/assets/bundles/icons/weapon/爆伤2.png.meta +++ b/assets/bundles/icons/weapon/爆伤2.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -0.5, "offsetY": 0.5, - "trimX": 19, - "trimY": 18, - "width": 162, - "height": 163, + "trimX": 34, + "trimY": 26, + "width": 131, + "height": 147, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -81, - -81.5, + -65.5, + -73.5, 0, - 81, - -81.5, + 65.5, + -73.5, 0, - -81, - 81.5, + -65.5, + 73.5, 0, - 81, - 81.5, + 65.5, + 73.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 19, - 182, - 181, - 182, - 19, - 19, - 181, - 19 + 34, + 174, + 165, + 174, + 34, + 27, + 165, + 27 ], "nuv": [ - 0.095, - 0.095, - 0.905, - 0.095, - 0.095, - 0.91, - 0.905, - 0.91 + 0.17, + 0.135, + 0.825, + 0.135, + 0.17, + 0.87, + 0.825, + 0.87 ], "minPos": [ - -81, - -81.5, + -65.5, + -73.5, 0 ], "maxPos": [ - 81, - 81.5, + 65.5, + 73.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/爆伤3.png b/assets/bundles/icons/weapon/爆伤3.png index d35a48d..abd2801 100644 Binary files a/assets/bundles/icons/weapon/爆伤3.png and b/assets/bundles/icons/weapon/爆伤3.png differ diff --git a/assets/bundles/icons/weapon/爆伤3.png.meta b/assets/bundles/icons/weapon/爆伤3.png.meta index ca2bd90..8343f6f 100644 --- a/assets/bundles/icons/weapon/爆伤3.png.meta +++ b/assets/bundles/icons/weapon/爆伤3.png.meta @@ -43,10 +43,10 @@ "rotated": false, "offsetX": -0.5, "offsetY": 0, - "trimX": 30, - "trimY": 18, - "width": 139, - "height": 164, + "trimX": 31, + "trimY": 27, + "width": 137, + "height": 146, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -69.5, - -82, + -68.5, + -73, 0, - 69.5, - -82, + 68.5, + -73, 0, - -69.5, - 82, + -68.5, + 73, 0, - 69.5, - 82, + 68.5, + 73, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 30, - 182, - 169, - 182, - 30, - 18, - 169, - 18 + 31, + 173, + 168, + 173, + 31, + 27, + 168, + 27 ], "nuv": [ - 0.15, - 0.09, - 0.845, - 0.09, - 0.15, - 0.91, - 0.845, - 0.91 + 0.155, + 0.135, + 0.84, + 0.135, + 0.155, + 0.865, + 0.84, + 0.865 ], "minPos": [ - -69.5, - -82, + -68.5, + -73, 0 ], "maxPos": [ - 69.5, - 82, + 68.5, + 73, 0 ] }, diff --git a/assets/bundles/icons/weapon/爆伤4.png b/assets/bundles/icons/weapon/爆伤4.png index ef0c0f9..44ad1f7 100644 Binary files a/assets/bundles/icons/weapon/爆伤4.png and b/assets/bundles/icons/weapon/爆伤4.png differ diff --git a/assets/bundles/icons/weapon/爆伤4.png.meta b/assets/bundles/icons/weapon/爆伤4.png.meta index 92ef377..8225b4d 100644 --- a/assets/bundles/icons/weapon/爆伤4.png.meta +++ b/assets/bundles/icons/weapon/爆伤4.png.meta @@ -42,11 +42,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0.5, - "trimX": 22, - "trimY": 21, - "width": 156, - "height": 157, + "offsetY": 0, + "trimX": 31, + "trimY": 22, + "width": 138, + "height": 156, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ + -69, -78, - -78.5, - 0, - 78, - -78.5, 0, + 69, -78, - 78.5, 0, + -69, + 78, + 0, + 69, 78, - 78.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 22, - 179, + 31, 178, - 179, - 22, - 22, + 169, 178, + 31, + 22, + 169, 22 ], "nuv": [ + 0.155, 0.11, + 0.845, 0.11, + 0.155, 0.89, - 0.11, - 0.11, - 0.895, - 0.89, - 0.895 + 0.845, + 0.89 ], "minPos": [ + -69, -78, - -78.5, 0 ], "maxPos": [ + 69, 78, - 78.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/爆伤5.png b/assets/bundles/icons/weapon/爆伤5.png index 6fd34ef..5efbca8 100644 Binary files a/assets/bundles/icons/weapon/爆伤5.png and b/assets/bundles/icons/weapon/爆伤5.png differ diff --git a/assets/bundles/icons/weapon/爆伤5.png.meta b/assets/bundles/icons/weapon/爆伤5.png.meta index 5c47929..912db3a 100644 --- a/assets/bundles/icons/weapon/爆伤5.png.meta +++ b/assets/bundles/icons/weapon/爆伤5.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": -0.5, + "offsetX": 0, "offsetY": 0.5, - "trimX": 17, - "trimY": 18, - "width": 165, - "height": 163, + "trimX": 25, + "trimY": 20, + "width": 150, + "height": 159, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -82.5, - -81.5, + -75, + -79.5, 0, - 82.5, - -81.5, + 75, + -79.5, 0, - -82.5, - 81.5, + -75, + 79.5, 0, - 82.5, - 81.5, + 75, + 79.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 17, - 182, - 182, - 182, - 17, - 19, - 182, - 19 + 25, + 180, + 175, + 180, + 25, + 21, + 175, + 21 ], "nuv": [ - 0.085, - 0.095, - 0.91, - 0.095, - 0.085, - 0.91, - 0.91, - 0.91 + 0.125, + 0.105, + 0.875, + 0.105, + 0.125, + 0.9, + 0.875, + 0.9 ], "minPos": [ - -82.5, - -81.5, + -75, + -79.5, 0 ], "maxPos": [ - 82.5, - 81.5, + 75, + 79.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/狠击2.png b/assets/bundles/icons/weapon/狠击2.png index f9b7d87..a1a2c1d 100644 Binary files a/assets/bundles/icons/weapon/狠击2.png and b/assets/bundles/icons/weapon/狠击2.png differ diff --git a/assets/bundles/icons/weapon/狠击2.png.meta b/assets/bundles/icons/weapon/狠击2.png.meta index 3cb8289..99ce3fa 100644 --- a/assets/bundles/icons/weapon/狠击2.png.meta +++ b/assets/bundles/icons/weapon/狠击2.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "16082804-2fde-463c-a912-94bc445e093b", + "uuid": "8e4761cb-ebc0-4541-9ef0-98e3909f3486", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "16082804-2fde-463c-a912-94bc445e093b@6c48a", + "uuid": "8e4761cb-ebc0-4541-9ef0-98e3909f3486@6c48a", "displayName": "狠击2", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "16082804-2fde-463c-a912-94bc445e093b", + "imageUuidOrDatabaseUri": "8e4761cb-ebc0-4541-9ef0-98e3909f3486", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,19 +34,19 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "16082804-2fde-463c-a912-94bc445e093b@f9941", + "uuid": "8e4761cb-ebc0-4541-9ef0-98e3909f3486@f9941", "displayName": "狠击2", "id": "f9941", "name": "spriteFrame", "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": -0.5, + "offsetX": 0, "offsetY": 0.5, - "trimX": 26, - "trimY": 28, - "width": 147, - "height": 143, + "trimX": 29, + "trimY": 23, + "width": 142, + "height": 153, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -73.5, - -71.5, + -71, + -76.5, 0, - 73.5, - -71.5, + 71, + -76.5, 0, - -73.5, - 71.5, + -71, + 76.5, 0, - 73.5, - 71.5, + 71, + 76.5, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 26, - 172, - 173, - 172, - 26, 29, - 173, - 29 + 177, + 171, + 177, + 29, + 24, + 171, + 24 ], "nuv": [ - 0.13, 0.145, - 0.865, + 0.12, + 0.855, + 0.12, 0.145, - 0.13, - 0.86, - 0.865, - 0.86 + 0.885, + 0.855, + 0.885 ], "minPos": [ - -73.5, - -71.5, + -71, + -76.5, 0 ], "maxPos": [ - 73.5, - 71.5, + 71, + 76.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "16082804-2fde-463c-a912-94bc445e093b@6c48a", + "imageUuidOrDatabaseUri": "8e4761cb-ebc0-4541-9ef0-98e3909f3486@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "16082804-2fde-463c-a912-94bc445e093b@6c48a" + "redirect": "8e4761cb-ebc0-4541-9ef0-98e3909f3486@6c48a" } } diff --git a/assets/bundles/icons/weapon/狠击3.png b/assets/bundles/icons/weapon/狠击3.png index aed393d..039c31f 100644 Binary files a/assets/bundles/icons/weapon/狠击3.png and b/assets/bundles/icons/weapon/狠击3.png differ diff --git a/assets/bundles/icons/weapon/狠击3.png.meta b/assets/bundles/icons/weapon/狠击3.png.meta index 15d95c9..1d77742 100644 --- a/assets/bundles/icons/weapon/狠击3.png.meta +++ b/assets/bundles/icons/weapon/狠击3.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "4006cbde-c926-498d-8631-5258650d5e8f", + "uuid": "fdedb221-81eb-437d-bfa4-36217770bb82", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "4006cbde-c926-498d-8631-5258650d5e8f@6c48a", + "uuid": "fdedb221-81eb-437d-bfa4-36217770bb82@6c48a", "displayName": "狠击3", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "4006cbde-c926-498d-8631-5258650d5e8f", + "imageUuidOrDatabaseUri": "fdedb221-81eb-437d-bfa4-36217770bb82", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,7 +34,7 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "4006cbde-c926-498d-8631-5258650d5e8f@f9941", + "uuid": "fdedb221-81eb-437d-bfa4-36217770bb82@f9941", "displayName": "狠击3", "id": "f9941", "name": "spriteFrame", @@ -43,10 +43,10 @@ "rotated": false, "offsetX": -0.5, "offsetY": 0.5, - "trimX": 23, - "trimY": 21, - "width": 153, - "height": 157, + "trimX": 28, + "trimY": 17, + "width": 143, + "height": 165, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -76.5, - -78.5, + -71.5, + -82.5, 0, - 76.5, - -78.5, + 71.5, + -82.5, 0, - -76.5, - 78.5, + -71.5, + 82.5, 0, - 76.5, - 78.5, + 71.5, + 82.5, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 23, - 179, - 176, - 179, - 23, - 22, - 176, - 22 + 28, + 183, + 171, + 183, + 28, + 18, + 171, + 18 ], "nuv": [ - 0.115, - 0.11, - 0.88, - 0.11, - 0.115, - 0.895, - 0.88, - 0.895 + 0.14, + 0.09, + 0.855, + 0.09, + 0.14, + 0.915, + 0.855, + 0.915 ], "minPos": [ - -76.5, - -78.5, + -71.5, + -82.5, 0 ], "maxPos": [ - 76.5, - 78.5, + 71.5, + 82.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "4006cbde-c926-498d-8631-5258650d5e8f@6c48a", + "imageUuidOrDatabaseUri": "fdedb221-81eb-437d-bfa4-36217770bb82@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "4006cbde-c926-498d-8631-5258650d5e8f@6c48a" + "redirect": "fdedb221-81eb-437d-bfa4-36217770bb82@6c48a" } } diff --git a/assets/bundles/icons/weapon/狠击4.png b/assets/bundles/icons/weapon/狠击4.png index 91af799..ea63fae 100644 Binary files a/assets/bundles/icons/weapon/狠击4.png and b/assets/bundles/icons/weapon/狠击4.png differ diff --git a/assets/bundles/icons/weapon/狠击4.png.meta b/assets/bundles/icons/weapon/狠击4.png.meta index ac69f36..0a8a9db 100644 --- a/assets/bundles/icons/weapon/狠击4.png.meta +++ b/assets/bundles/icons/weapon/狠击4.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "81057b15-904b-4fa3-a91d-d40ef0bf745a", + "uuid": "f5f26714-42cb-41c9-ab7b-8e2f2301238c", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "81057b15-904b-4fa3-a91d-d40ef0bf745a@6c48a", + "uuid": "f5f26714-42cb-41c9-ab7b-8e2f2301238c@6c48a", "displayName": "狠击4", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "81057b15-904b-4fa3-a91d-d40ef0bf745a", + "imageUuidOrDatabaseUri": "f5f26714-42cb-41c9-ab7b-8e2f2301238c", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,7 +34,7 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "81057b15-904b-4fa3-a91d-d40ef0bf745a@f9941", + "uuid": "f5f26714-42cb-41c9-ab7b-8e2f2301238c@f9941", "displayName": "狠击4", "id": "f9941", "name": "spriteFrame", @@ -42,11 +42,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, - "trimX": 19, - "trimY": 19, - "width": 162, - "height": 162, + "offsetY": 0.5, + "trimX": 26, + "trimY": 21, + "width": 148, + "height": 157, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -81, - -81, + -74, + -78.5, 0, - 81, - -81, + 74, + -78.5, 0, - -81, - 81, + -74, + 78.5, 0, - 81, - 81, + 74, + 78.5, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 19, - 181, - 181, - 181, - 19, - 19, - 181, - 19 + 26, + 179, + 174, + 179, + 26, + 22, + 174, + 22 ], "nuv": [ - 0.095, - 0.095, - 0.905, - 0.095, - 0.095, - 0.905, - 0.905, - 0.905 + 0.13, + 0.11, + 0.87, + 0.11, + 0.13, + 0.895, + 0.87, + 0.895 ], "minPos": [ - -81, - -81, + -74, + -78.5, 0 ], "maxPos": [ - 81, - 81, + 74, + 78.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "81057b15-904b-4fa3-a91d-d40ef0bf745a@6c48a", + "imageUuidOrDatabaseUri": "f5f26714-42cb-41c9-ab7b-8e2f2301238c@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "81057b15-904b-4fa3-a91d-d40ef0bf745a@6c48a" + "redirect": "f5f26714-42cb-41c9-ab7b-8e2f2301238c@6c48a" } } diff --git a/assets/bundles/icons/weapon/狠击5.png b/assets/bundles/icons/weapon/狠击5.png index 3993fc2..d04b14b 100644 Binary files a/assets/bundles/icons/weapon/狠击5.png and b/assets/bundles/icons/weapon/狠击5.png differ diff --git a/assets/bundles/icons/weapon/狠击5.png.meta b/assets/bundles/icons/weapon/狠击5.png.meta index b0cbf7a..c4c02be 100644 --- a/assets/bundles/icons/weapon/狠击5.png.meta +++ b/assets/bundles/icons/weapon/狠击5.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "7da98f33-116f-4d0f-9d4e-fee650210996", + "uuid": "edbbb569-51bc-41b2-a6cd-7c888adb070a", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "7da98f33-116f-4d0f-9d4e-fee650210996@6c48a", + "uuid": "edbbb569-51bc-41b2-a6cd-7c888adb070a@6c48a", "displayName": "狠击5", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "7da98f33-116f-4d0f-9d4e-fee650210996", + "imageUuidOrDatabaseUri": "edbbb569-51bc-41b2-a6cd-7c888adb070a", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,19 +34,19 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "7da98f33-116f-4d0f-9d4e-fee650210996@f9941", + "uuid": "edbbb569-51bc-41b2-a6cd-7c888adb070a@f9941", "displayName": "狠击5", "id": "f9941", "name": "spriteFrame", "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": -0.5, - "offsetY": 0.5, - "trimX": 17, - "trimY": 19, - "width": 165, - "height": 161, + "offsetX": 0, + "offsetY": 0, + "trimX": 20, + "trimY": 12, + "width": 160, + "height": 176, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -82.5, - -80.5, + -80, + -88, 0, - 82.5, - -80.5, + 80, + -88, 0, - -82.5, - 80.5, + -80, + 88, 0, - 82.5, - 80.5, + 80, + 88, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 17, - 181, - 182, - 181, - 17, 20, - 182, - 20 + 188, + 180, + 188, + 20, + 12, + 180, + 12 ], "nuv": [ - 0.085, 0.1, - 0.91, + 0.06, + 0.9, + 0.06, 0.1, - 0.085, - 0.905, - 0.91, - 0.905 + 0.94, + 0.9, + 0.94 ], "minPos": [ - -82.5, - -80.5, + -80, + -88, 0 ], "maxPos": [ - 82.5, - 80.5, + 80, + 88, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "7da98f33-116f-4d0f-9d4e-fee650210996@6c48a", + "imageUuidOrDatabaseUri": "edbbb569-51bc-41b2-a6cd-7c888adb070a@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "7da98f33-116f-4d0f-9d4e-fee650210996@6c48a" + "redirect": "edbbb569-51bc-41b2-a6cd-7c888adb070a@6c48a" } } diff --git a/assets/bundles/icons/weapon/神通2.png b/assets/bundles/icons/weapon/神通2.png index 6cb160a..b23438b 100644 Binary files a/assets/bundles/icons/weapon/神通2.png and b/assets/bundles/icons/weapon/神通2.png differ diff --git a/assets/bundles/icons/weapon/神通2.png.meta b/assets/bundles/icons/weapon/神通2.png.meta index f9a93c6..de5b8b1 100644 --- a/assets/bundles/icons/weapon/神通2.png.meta +++ b/assets/bundles/icons/weapon/神通2.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": -0.5, - "offsetY": 0.5, - "trimX": 26, - "trimY": 28, - "width": 147, - "height": 143, + "offsetX": 0, + "offsetY": 0, + "trimX": 29, + "trimY": 22, + "width": 142, + "height": 156, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -73.5, - -71.5, + -71, + -78, 0, - 73.5, - -71.5, + 71, + -78, 0, - -73.5, - 71.5, + -71, + 78, 0, - 73.5, - 71.5, + 71, + 78, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 26, - 172, - 173, - 172, - 26, 29, - 173, - 29 + 178, + 171, + 178, + 29, + 22, + 171, + 22 ], "nuv": [ - 0.13, 0.145, - 0.865, + 0.11, + 0.855, + 0.11, 0.145, - 0.13, - 0.86, - 0.865, - 0.86 + 0.89, + 0.855, + 0.89 ], "minPos": [ - -73.5, - -71.5, + -71, + -78, 0 ], "maxPos": [ - 73.5, - 71.5, + 71, + 78, 0 ] }, diff --git a/assets/bundles/icons/weapon/神通3.png b/assets/bundles/icons/weapon/神通3.png index 8f53abe..379d675 100644 Binary files a/assets/bundles/icons/weapon/神通3.png and b/assets/bundles/icons/weapon/神通3.png differ diff --git a/assets/bundles/icons/weapon/神通3.png.meta b/assets/bundles/icons/weapon/神通3.png.meta index fe078a3..5dbe359 100644 --- a/assets/bundles/icons/weapon/神通3.png.meta +++ b/assets/bundles/icons/weapon/神通3.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": -0.5, + "offsetX": 0, "offsetY": 0.5, - "trimX": 23, - "trimY": 21, - "width": 153, - "height": 157, + "trimX": 25, + "trimY": 20, + "width": 150, + "height": 159, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -76.5, - -78.5, + -75, + -79.5, 0, - 76.5, - -78.5, + 75, + -79.5, 0, - -76.5, - 78.5, + -75, + 79.5, 0, - 76.5, - 78.5, + 75, + 79.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 23, - 179, - 176, - 179, - 23, - 22, - 176, - 22 + 25, + 180, + 175, + 180, + 25, + 21, + 175, + 21 ], "nuv": [ - 0.115, - 0.11, - 0.88, - 0.11, - 0.115, - 0.895, - 0.88, - 0.895 + 0.125, + 0.105, + 0.875, + 0.105, + 0.125, + 0.9, + 0.875, + 0.9 ], "minPos": [ - -76.5, - -78.5, + -75, + -79.5, 0 ], "maxPos": [ - 76.5, - 78.5, + 75, + 79.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/神通4.png b/assets/bundles/icons/weapon/神通4.png index 2b955b1..1ca0955 100644 Binary files a/assets/bundles/icons/weapon/神通4.png and b/assets/bundles/icons/weapon/神通4.png differ diff --git a/assets/bundles/icons/weapon/神通4.png.meta b/assets/bundles/icons/weapon/神通4.png.meta index 10e8f37..885820e 100644 --- a/assets/bundles/icons/weapon/神通4.png.meta +++ b/assets/bundles/icons/weapon/神通4.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 19, - "trimY": 19, - "width": 162, - "height": 162, + "offsetX": -0.5, + "offsetY": 0.5, + "trimX": 28, + "trimY": 17, + "width": 143, + "height": 165, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -81, - -81, + -71.5, + -82.5, 0, - 81, - -81, + 71.5, + -82.5, 0, - -81, - 81, + -71.5, + 82.5, 0, - 81, - 81, + 71.5, + 82.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 19, - 181, - 181, - 181, - 19, - 19, - 181, - 19 + 28, + 183, + 171, + 183, + 28, + 18, + 171, + 18 ], "nuv": [ - 0.095, - 0.095, - 0.905, - 0.095, - 0.095, - 0.905, - 0.905, - 0.905 + 0.14, + 0.09, + 0.855, + 0.09, + 0.14, + 0.915, + 0.855, + 0.915 ], "minPos": [ - -81, - -81, + -71.5, + -82.5, 0 ], "maxPos": [ - 81, - 81, + 71.5, + 82.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/神通5.png b/assets/bundles/icons/weapon/神通5.png index 730d716..4e0cd71 100644 Binary files a/assets/bundles/icons/weapon/神通5.png and b/assets/bundles/icons/weapon/神通5.png differ diff --git a/assets/bundles/icons/weapon/神通5.png.meta b/assets/bundles/icons/weapon/神通5.png.meta index 89c848e..5ac2fac 100644 --- a/assets/bundles/icons/weapon/神通5.png.meta +++ b/assets/bundles/icons/weapon/神通5.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": -0.5, - "offsetY": 0.5, - "trimX": 17, - "trimY": 19, - "width": 165, - "height": 161, + "offsetX": 0, + "offsetY": 0, + "trimX": 20, + "trimY": 12, + "width": 160, + "height": 176, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -82.5, - -80.5, + -80, + -88, 0, - 82.5, - -80.5, + 80, + -88, 0, - -82.5, - 80.5, + -80, + 88, 0, - 82.5, - 80.5, + 80, + 88, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 17, - 181, - 182, - 181, - 17, 20, - 182, - 20 + 188, + 180, + 188, + 20, + 12, + 180, + 12 ], "nuv": [ - 0.085, 0.1, - 0.91, + 0.06, + 0.9, + 0.06, 0.1, - 0.085, - 0.905, - 0.91, - 0.905 + 0.94, + 0.9, + 0.94 ], "minPos": [ - -82.5, - -80.5, + -80, + -88, 0 ], "maxPos": [ - 82.5, - 80.5, + 80, + 88, 0 ] }, diff --git a/assets/bundles/icons/weapon/箭雨2.png b/assets/bundles/icons/weapon/箭雨2.png index e4dd2d3..d0b5d43 100644 Binary files a/assets/bundles/icons/weapon/箭雨2.png and b/assets/bundles/icons/weapon/箭雨2.png differ diff --git a/assets/bundles/icons/weapon/箭雨2.png.meta b/assets/bundles/icons/weapon/箭雨2.png.meta index 9046081..0167de5 100644 --- a/assets/bundles/icons/weapon/箭雨2.png.meta +++ b/assets/bundles/icons/weapon/箭雨2.png.meta @@ -43,10 +43,10 @@ "rotated": false, "offsetX": -0.5, "offsetY": 0.5, - "trimX": 23, - "trimY": 26, - "width": 153, - "height": 147, + "trimX": 39, + "trimY": 22, + "width": 121, + "height": 155, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -76.5, - -73.5, + -60.5, + -77.5, 0, - 76.5, - -73.5, + 60.5, + -77.5, 0, - -76.5, - 73.5, + -60.5, + 77.5, 0, - 76.5, - 73.5, + 60.5, + 77.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ + 39, + 178, + 160, + 178, + 39, 23, - 174, - 176, - 174, - 23, - 27, - 176, - 27 + 160, + 23 ], "nuv": [ + 0.195, 0.115, - 0.135, - 0.88, - 0.135, + 0.8, 0.115, - 0.87, - 0.88, - 0.87 + 0.195, + 0.89, + 0.8, + 0.89 ], "minPos": [ - -76.5, - -73.5, + -60.5, + -77.5, 0 ], "maxPos": [ - 76.5, - 73.5, + 60.5, + 77.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/箭雨3.png b/assets/bundles/icons/weapon/箭雨3.png index 62a855f..e82389f 100644 Binary files a/assets/bundles/icons/weapon/箭雨3.png and b/assets/bundles/icons/weapon/箭雨3.png differ diff --git a/assets/bundles/icons/weapon/箭雨3.png.meta b/assets/bundles/icons/weapon/箭雨3.png.meta index 987ea59..678515b 100644 --- a/assets/bundles/icons/weapon/箭雨3.png.meta +++ b/assets/bundles/icons/weapon/箭雨3.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0.5, - "trimX": 9, - "trimY": 23, - "width": 182, - "height": 153, + "offsetX": -0.5, + "offsetY": 0, + "trimX": 39, + "trimY": 22, + "width": 121, + "height": 156, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -91, - -76.5, + -60.5, + -78, 0, - 91, - -76.5, + 60.5, + -78, 0, - -91, - 76.5, + -60.5, + 78, 0, - 91, - 76.5, + 60.5, + 78, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 9, - 177, - 191, - 177, - 9, - 24, - 191, - 24 + 39, + 178, + 160, + 178, + 39, + 22, + 160, + 22 ], "nuv": [ - 0.045, - 0.12, - 0.955, - 0.12, - 0.045, - 0.885, - 0.955, - 0.885 + 0.195, + 0.11, + 0.8, + 0.11, + 0.195, + 0.89, + 0.8, + 0.89 ], "minPos": [ - -91, - -76.5, + -60.5, + -78, 0 ], "maxPos": [ - 91, - 76.5, + 60.5, + 78, 0 ] }, diff --git a/assets/bundles/icons/weapon/箭雨4.png b/assets/bundles/icons/weapon/箭雨4.png index 8307940..a8589b6 100644 Binary files a/assets/bundles/icons/weapon/箭雨4.png and b/assets/bundles/icons/weapon/箭雨4.png differ diff --git a/assets/bundles/icons/weapon/箭雨4.png.meta b/assets/bundles/icons/weapon/箭雨4.png.meta index 9243c3e..50099ed 100644 --- a/assets/bundles/icons/weapon/箭雨4.png.meta +++ b/assets/bundles/icons/weapon/箭雨4.png.meta @@ -42,11 +42,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, - "trimX": 13, - "trimY": 19, - "width": 174, - "height": 162, + "offsetY": 0.5, + "trimX": 35, + "trimY": 17, + "width": 130, + "height": 165, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -87, - -81, + -65, + -82.5, 0, - 87, - -81, + 65, + -82.5, 0, - -87, - 81, + -65, + 82.5, 0, - 87, - 81, + 65, + 82.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 13, - 181, - 187, - 181, - 13, - 19, - 187, - 19 + 35, + 183, + 165, + 183, + 35, + 18, + 165, + 18 ], "nuv": [ - 0.065, - 0.095, - 0.935, - 0.095, - 0.065, - 0.905, - 0.935, - 0.905 + 0.175, + 0.09, + 0.825, + 0.09, + 0.175, + 0.915, + 0.825, + 0.915 ], "minPos": [ - -87, - -81, + -65, + -82.5, 0 ], "maxPos": [ - 87, - 81, + 65, + 82.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/箭雨5.png b/assets/bundles/icons/weapon/箭雨5.png index efba685..c22080f 100644 Binary files a/assets/bundles/icons/weapon/箭雨5.png and b/assets/bundles/icons/weapon/箭雨5.png differ diff --git a/assets/bundles/icons/weapon/箭雨5.png.meta b/assets/bundles/icons/weapon/箭雨5.png.meta index 6189b06..e45747a 100644 --- a/assets/bundles/icons/weapon/箭雨5.png.meta +++ b/assets/bundles/icons/weapon/箭雨5.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0, + "offsetX": -0.5, "offsetY": 0.5, - "trimX": 14, - "trimY": 4, - "width": 172, - "height": 191, + "trimX": 10, + "trimY": 17, + "width": 179, + "height": 165, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -86, - -95.5, + -89.5, + -82.5, 0, - 86, - -95.5, + 89.5, + -82.5, 0, - -86, - 95.5, + -89.5, + 82.5, 0, - 86, - 95.5, + 89.5, + 82.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 14, - 196, - 186, - 196, - 14, - 5, - 186, - 5 + 10, + 183, + 189, + 183, + 10, + 18, + 189, + 18 ], "nuv": [ - 0.07, - 0.025, - 0.93, - 0.025, - 0.07, - 0.98, - 0.93, - 0.98 + 0.05, + 0.09, + 0.945, + 0.09, + 0.05, + 0.915, + 0.945, + 0.915 ], "minPos": [ - -86, - -95.5, + -89.5, + -82.5, 0 ], "maxPos": [ - 86, - 95.5, + 89.5, + 82.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/飞剑1.png b/assets/bundles/icons/weapon/飞剑1.png index fb4a935..d95d10f 100644 Binary files a/assets/bundles/icons/weapon/飞剑1.png and b/assets/bundles/icons/weapon/飞剑1.png differ diff --git a/assets/bundles/icons/weapon/飞剑1.png.meta b/assets/bundles/icons/weapon/飞剑1.png.meta index fa2f0e1..6abd316 100644 --- a/assets/bundles/icons/weapon/飞剑1.png.meta +++ b/assets/bundles/icons/weapon/飞剑1.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "d3bdd2a5-bfc6-45a2-80f4-be44a9082dbf", + "uuid": "394908b1-ccf6-4427-b073-ef7cc7ec9d0b", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "d3bdd2a5-bfc6-45a2-80f4-be44a9082dbf@6c48a", + "uuid": "394908b1-ccf6-4427-b073-ef7cc7ec9d0b@6c48a", "displayName": "飞剑1", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "d3bdd2a5-bfc6-45a2-80f4-be44a9082dbf", + "imageUuidOrDatabaseUri": "394908b1-ccf6-4427-b073-ef7cc7ec9d0b", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,7 +34,7 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "d3bdd2a5-bfc6-45a2-80f4-be44a9082dbf@f9941", + "uuid": "394908b1-ccf6-4427-b073-ef7cc7ec9d0b@f9941", "displayName": "飞剑1", "id": "f9941", "name": "spriteFrame", @@ -42,11 +42,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0.5, - "trimX": 27, - "trimY": 34, - "width": 146, - "height": 131, + "offsetY": 0, + "trimX": 40, + "trimY": 23, + "width": 120, + "height": 154, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -73, - -65.5, + -60, + -77, 0, - 73, - -65.5, + 60, + -77, 0, - -73, - 65.5, + -60, + 77, 0, - 73, - 65.5, + 60, + 77, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 27, - 166, - 173, - 166, - 27, - 35, - 173, - 35 + 40, + 177, + 160, + 177, + 40, + 23, + 160, + 23 ], "nuv": [ - 0.135, - 0.175, - 0.865, - 0.175, - 0.135, - 0.83, - 0.865, - 0.83 + 0.2, + 0.115, + 0.8, + 0.115, + 0.2, + 0.885, + 0.8, + 0.885 ], "minPos": [ - -73, - -65.5, + -60, + -77, 0 ], "maxPos": [ - 73, - 65.5, + 60, + 77, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "d3bdd2a5-bfc6-45a2-80f4-be44a9082dbf@6c48a", + "imageUuidOrDatabaseUri": "394908b1-ccf6-4427-b073-ef7cc7ec9d0b@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "d3bdd2a5-bfc6-45a2-80f4-be44a9082dbf@6c48a" + "redirect": "394908b1-ccf6-4427-b073-ef7cc7ec9d0b@6c48a" } } diff --git a/assets/bundles/icons/weapon/飞剑2.png b/assets/bundles/icons/weapon/飞剑2.png index b91ad67..dd95f43 100644 Binary files a/assets/bundles/icons/weapon/飞剑2.png and b/assets/bundles/icons/weapon/飞剑2.png differ diff --git a/assets/bundles/icons/weapon/飞剑2.png.meta b/assets/bundles/icons/weapon/飞剑2.png.meta index eec5c92..27f53b1 100644 --- a/assets/bundles/icons/weapon/飞剑2.png.meta +++ b/assets/bundles/icons/weapon/飞剑2.png.meta @@ -43,10 +43,10 @@ "rotated": false, "offsetX": -0.5, "offsetY": 0, - "trimX": 20, - "trimY": 22, - "width": 159, - "height": 156, + "trimX": 35, + "trimY": 21, + "width": 129, + "height": 158, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -79.5, - -78, + -64.5, + -79, 0, - 79.5, - -78, + 64.5, + -79, 0, - -79.5, - 78, + -64.5, + 79, 0, - 79.5, - 78, + 64.5, + 79, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 20, - 178, + 35, 179, - 178, - 20, - 22, + 164, 179, - 22 + 35, + 21, + 164, + 21 ], "nuv": [ - 0.1, - 0.11, + 0.175, + 0.105, + 0.82, + 0.105, + 0.175, 0.895, - 0.11, - 0.1, - 0.89, - 0.895, - 0.89 + 0.82, + 0.895 ], "minPos": [ - -79.5, - -78, + -64.5, + -79, 0 ], "maxPos": [ - 79.5, - 78, + 64.5, + 79, 0 ] }, diff --git a/assets/bundles/icons/weapon/飞剑3.png b/assets/bundles/icons/weapon/飞剑3.png index d9fa464..576011b 100644 Binary files a/assets/bundles/icons/weapon/飞剑3.png and b/assets/bundles/icons/weapon/飞剑3.png differ diff --git a/assets/bundles/icons/weapon/飞剑3.png.meta b/assets/bundles/icons/weapon/飞剑3.png.meta index a6589ad..479fde4 100644 --- a/assets/bundles/icons/weapon/飞剑3.png.meta +++ b/assets/bundles/icons/weapon/飞剑3.png.meta @@ -42,11 +42,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0.5, - "trimX": 29, - "trimY": 19, - "width": 142, - "height": 161, + "offsetY": 0, + "trimX": 40, + "trimY": 23, + "width": 120, + "height": 154, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -71, - -80.5, + -60, + -77, 0, - 71, - -80.5, + 60, + -77, 0, - -71, - 80.5, + -60, + 77, 0, - 71, - 80.5, + 60, + 77, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 29, - 181, - 171, - 181, - 29, - 20, - 171, - 20 + 40, + 177, + 160, + 177, + 40, + 23, + 160, + 23 ], "nuv": [ - 0.145, - 0.1, - 0.855, - 0.1, - 0.145, - 0.905, - 0.855, - 0.905 + 0.2, + 0.115, + 0.8, + 0.115, + 0.2, + 0.885, + 0.8, + 0.885 ], "minPos": [ - -71, - -80.5, + -60, + -77, 0 ], "maxPos": [ - 71, - 80.5, + 60, + 77, 0 ] }, diff --git a/assets/bundles/icons/weapon/飞剑4.png b/assets/bundles/icons/weapon/飞剑4.png index 6e2bd80..13a62f5 100644 Binary files a/assets/bundles/icons/weapon/飞剑4.png and b/assets/bundles/icons/weapon/飞剑4.png differ diff --git a/assets/bundles/icons/weapon/飞剑4.png.meta b/assets/bundles/icons/weapon/飞剑4.png.meta index 90850d1..1c5f9e2 100644 --- a/assets/bundles/icons/weapon/飞剑4.png.meta +++ b/assets/bundles/icons/weapon/飞剑4.png.meta @@ -42,11 +42,11 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0, - "offsetY": 0, - "trimX": 18, - "trimY": 19, - "width": 164, - "height": 162, + "offsetY": 0.5, + "trimX": 30, + "trimY": 15, + "width": 140, + "height": 169, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -82, - -81, + -70, + -84.5, 0, - 82, - -81, + 70, + -84.5, 0, - -82, - 81, + -70, + 84.5, 0, - 82, - 81, + 70, + 84.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 18, - 181, - 182, - 181, - 18, - 19, - 182, - 19 + 30, + 185, + 170, + 185, + 30, + 16, + 170, + 16 ], "nuv": [ - 0.09, - 0.095, - 0.91, - 0.095, - 0.09, - 0.905, - 0.91, - 0.905 + 0.15, + 0.08, + 0.85, + 0.08, + 0.15, + 0.925, + 0.85, + 0.925 ], "minPos": [ - -82, - -81, + -70, + -84.5, 0 ], "maxPos": [ - 82, - 81, + 70, + 84.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/飞剑5.png b/assets/bundles/icons/weapon/飞剑5.png index 80d2dd6..976706f 100644 Binary files a/assets/bundles/icons/weapon/飞剑5.png and b/assets/bundles/icons/weapon/飞剑5.png differ diff --git a/assets/bundles/icons/weapon/飞剑5.png.meta b/assets/bundles/icons/weapon/飞剑5.png.meta index 59bb3b8..b4cfe06 100644 --- a/assets/bundles/icons/weapon/飞剑5.png.meta +++ b/assets/bundles/icons/weapon/飞剑5.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "ea203008-8303-4824-b222-b2096be2bca3", + "uuid": "73710b5d-fecd-40d8-9d3b-e82498c9a02a", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "ea203008-8303-4824-b222-b2096be2bca3@6c48a", + "uuid": "73710b5d-fecd-40d8-9d3b-e82498c9a02a@6c48a", "displayName": "飞剑5", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "ea203008-8303-4824-b222-b2096be2bca3", + "imageUuidOrDatabaseUri": "73710b5d-fecd-40d8-9d3b-e82498c9a02a", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,19 +34,19 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "ea203008-8303-4824-b222-b2096be2bca3@f9941", + "uuid": "73710b5d-fecd-40d8-9d3b-e82498c9a02a@f9941", "displayName": "飞剑5", "id": "f9941", "name": "spriteFrame", "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": -0.5, - "offsetY": 0, - "trimX": 13, + "offsetX": 0, + "offsetY": 0.5, + "trimX": 35, "trimY": 17, - "width": 173, - "height": 166, + "width": 130, + "height": 165, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -86.5, - -83, + -65, + -82.5, 0, - 86.5, - -83, + 65, + -82.5, 0, - -86.5, - 83, + -65, + 82.5, 0, - 86.5, - 83, + 65, + 82.5, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 13, + 35, 183, - 186, + 165, 183, - 13, - 17, - 186, - 17 + 35, + 18, + 165, + 18 ], "nuv": [ - 0.065, - 0.085, - 0.93, - 0.085, - 0.065, + 0.175, + 0.09, + 0.825, + 0.09, + 0.175, 0.915, - 0.93, + 0.825, 0.915 ], "minPos": [ - -86.5, - -83, + -65, + -82.5, 0 ], "maxPos": [ - 86.5, - 83, + 65, + 82.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "ea203008-8303-4824-b222-b2096be2bca3@6c48a", + "imageUuidOrDatabaseUri": "73710b5d-fecd-40d8-9d3b-e82498c9a02a@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "ea203008-8303-4824-b222-b2096be2bca3@6c48a" + "redirect": "73710b5d-fecd-40d8-9d3b-e82498c9a02a@6c48a" } } diff --git a/assets/bundles/icons/weapon/飞棍1.png b/assets/bundles/icons/weapon/飞棍1.png index a7a6145..6ad28d6 100644 Binary files a/assets/bundles/icons/weapon/飞棍1.png and b/assets/bundles/icons/weapon/飞棍1.png differ diff --git a/assets/bundles/icons/weapon/飞棍1.png.meta b/assets/bundles/icons/weapon/飞棍1.png.meta index 0d5612c..f1699b3 100644 --- a/assets/bundles/icons/weapon/飞棍1.png.meta +++ b/assets/bundles/icons/weapon/飞棍1.png.meta @@ -43,10 +43,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 26, - "trimY": 33, - "width": 148, - "height": 134, + "trimX": 40, + "trimY": 23, + "width": 120, + "height": 154, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -74, - -67, + -60, + -77, 0, - 74, - -67, + 60, + -77, 0, - -74, - 67, + -60, + 77, 0, - 74, - 67, + 60, + 77, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 26, - 167, - 174, - 167, - 26, - 33, - 174, - 33 + 40, + 177, + 160, + 177, + 40, + 23, + 160, + 23 ], "nuv": [ - 0.13, - 0.165, - 0.87, - 0.165, - 0.13, - 0.835, - 0.87, - 0.835 + 0.2, + 0.115, + 0.8, + 0.115, + 0.2, + 0.885, + 0.8, + 0.885 ], "minPos": [ - -74, - -67, + -60, + -77, 0 ], "maxPos": [ - 74, - 67, + 60, + 77, 0 ] }, diff --git a/assets/bundles/icons/weapon/飞棍2.png b/assets/bundles/icons/weapon/飞棍2.png index 08be173..debb33c 100644 Binary files a/assets/bundles/icons/weapon/飞棍2.png and b/assets/bundles/icons/weapon/飞棍2.png differ diff --git a/assets/bundles/icons/weapon/飞棍2.png.meta b/assets/bundles/icons/weapon/飞棍2.png.meta index 2e2e48c..25143d9 100644 --- a/assets/bundles/icons/weapon/飞棍2.png.meta +++ b/assets/bundles/icons/weapon/飞棍2.png.meta @@ -43,10 +43,10 @@ "rotated": false, "offsetX": -0.5, "offsetY": 0.5, - "trimX": 26, - "trimY": 28, - "width": 147, - "height": 143, + "trimX": 39, + "trimY": 22, + "width": 121, + "height": 155, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -73.5, - -71.5, + -60.5, + -77.5, 0, - 73.5, - -71.5, + 60.5, + -77.5, 0, - -73.5, - 71.5, + -60.5, + 77.5, 0, - 73.5, - 71.5, + 60.5, + 77.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 26, - 172, - 173, - 172, - 26, - 29, - 173, - 29 + 39, + 178, + 160, + 178, + 39, + 23, + 160, + 23 ], "nuv": [ - 0.13, - 0.145, - 0.865, - 0.145, - 0.13, - 0.86, - 0.865, - 0.86 + 0.195, + 0.115, + 0.8, + 0.115, + 0.195, + 0.89, + 0.8, + 0.89 ], "minPos": [ - -73.5, - -71.5, + -60.5, + -77.5, 0 ], "maxPos": [ - 73.5, - 71.5, + 60.5, + 77.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/飞棍3.png b/assets/bundles/icons/weapon/飞棍3.png index c3031cf..f8fffff 100644 Binary files a/assets/bundles/icons/weapon/飞棍3.png and b/assets/bundles/icons/weapon/飞棍3.png differ diff --git a/assets/bundles/icons/weapon/飞棍3.png.meta b/assets/bundles/icons/weapon/飞棍3.png.meta index fe01ae3..64ceab4 100644 --- a/assets/bundles/icons/weapon/飞棍3.png.meta +++ b/assets/bundles/icons/weapon/飞棍3.png.meta @@ -43,10 +43,10 @@ "rotated": false, "offsetX": -0.5, "offsetY": 0.5, - "trimX": 23, - "trimY": 21, - "width": 153, - "height": 157, + "trimX": 29, + "trimY": 15, + "width": 141, + "height": 169, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -76.5, - -78.5, + -70.5, + -84.5, 0, - 76.5, - -78.5, + 70.5, + -84.5, 0, - -76.5, - 78.5, + -70.5, + 84.5, 0, - 76.5, - 78.5, + 70.5, + 84.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 23, - 179, - 176, - 179, - 23, - 22, - 176, - 22 + 29, + 185, + 170, + 185, + 29, + 16, + 170, + 16 ], "nuv": [ - 0.115, - 0.11, - 0.88, - 0.11, - 0.115, - 0.895, - 0.88, - 0.895 + 0.145, + 0.08, + 0.85, + 0.08, + 0.145, + 0.925, + 0.85, + 0.925 ], "minPos": [ - -76.5, - -78.5, + -70.5, + -84.5, 0 ], "maxPos": [ - 76.5, - 78.5, + 70.5, + 84.5, 0 ] }, diff --git a/assets/bundles/icons/weapon/飞棍4.png b/assets/bundles/icons/weapon/飞棍4.png index 8af6d25..91c9482 100644 Binary files a/assets/bundles/icons/weapon/飞棍4.png and b/assets/bundles/icons/weapon/飞棍4.png differ diff --git a/assets/bundles/icons/weapon/飞棍4.png.meta b/assets/bundles/icons/weapon/飞棍4.png.meta index 699ab77..7d79e2e 100644 --- a/assets/bundles/icons/weapon/飞棍4.png.meta +++ b/assets/bundles/icons/weapon/飞棍4.png.meta @@ -43,10 +43,10 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 19, - "trimY": 19, - "width": 162, - "height": 162, + "trimX": 25, + "trimY": 10, + "width": 150, + "height": 180, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -81, - -81, + -75, + -90, 0, - 81, - -81, + 75, + -90, 0, - -81, - 81, + -75, + 90, 0, - 81, - 81, + 75, + 90, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 19, - 181, - 181, - 181, - 19, - 19, - 181, - 19 + 25, + 190, + 175, + 190, + 25, + 10, + 175, + 10 ], "nuv": [ - 0.095, - 0.095, - 0.905, - 0.095, - 0.095, - 0.905, - 0.905, - 0.905 + 0.125, + 0.05, + 0.875, + 0.05, + 0.125, + 0.95, + 0.875, + 0.95 ], "minPos": [ - -81, - -81, + -75, + -90, 0 ], "maxPos": [ - 81, - 81, + 75, + 90, 0 ] }, diff --git a/assets/bundles/icons/weapon/飞棍5.png b/assets/bundles/icons/weapon/飞棍5.png index 644292d..d45be23 100644 Binary files a/assets/bundles/icons/weapon/飞棍5.png and b/assets/bundles/icons/weapon/飞棍5.png differ diff --git a/assets/bundles/icons/weapon/飞棍5.png.meta b/assets/bundles/icons/weapon/飞棍5.png.meta index 08ecc76..3f77da8 100644 --- a/assets/bundles/icons/weapon/飞棍5.png.meta +++ b/assets/bundles/icons/weapon/飞棍5.png.meta @@ -41,12 +41,12 @@ "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": -0.5, + "offsetX": 0, "offsetY": 0.5, - "trimX": 17, - "trimY": 19, - "width": 165, - "height": 161, + "trimX": 25, + "trimY": 10, + "width": 150, + "height": 179, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -82.5, - -80.5, + -75, + -89.5, 0, - 82.5, - -80.5, + 75, + -89.5, 0, - -82.5, - 80.5, + -75, + 89.5, 0, - 82.5, - 80.5, + 75, + 89.5, 0 ], "indexes": [ @@ -82,33 +82,33 @@ 3 ], "uv": [ - 17, - 181, - 182, - 181, - 17, - 20, - 182, - 20 + 25, + 190, + 175, + 190, + 25, + 11, + 175, + 11 ], "nuv": [ - 0.085, - 0.1, - 0.91, - 0.1, - 0.085, - 0.905, - 0.91, - 0.905 + 0.125, + 0.055, + 0.875, + 0.055, + 0.125, + 0.95, + 0.875, + 0.95 ], "minPos": [ - -82.5, - -80.5, + -75, + -89.5, 0 ], "maxPos": [ - 82.5, - 80.5, + 75, + 89.5, 0 ] }, diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果.meta b/assets/res/battleGameWeapon/spine/装备掉落效果.meta new file mode 100644 index 0000000..bd9670c --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "2c44a5c2-3301-4a7b-b82b-7cea231f3f19", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/橙装掉落.meta b/assets/res/battleGameWeapon/spine/装备掉落效果/橙装掉落.meta new file mode 100644 index 0000000..1510503 --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/橙装掉落.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "3705dd9f-71d6-49ba-9d14-15acd17a21e1", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/橙装掉落/橙装掉落.atlas b/assets/res/battleGameWeapon/spine/装备掉落效果/橙装掉落/橙装掉落.atlas new file mode 100644 index 0000000..b42dd7d --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/橙装掉落/橙装掉落.atlas @@ -0,0 +1,48 @@ + +橙装掉落.png +size: 534,176 +format: RGBA8888 +filter: Linear,Linear +repeat: none +12131 + rotate: true + xy: 220, 0 + size: 12, 141 + orig: 12, 145 + offset: 0, 2 + index: -1 +图层 4 + rotate: true + xy: 0, 0 + size: 176, 218 + orig: 192, 243 + offset: 15, 2 + index: -1 +圈圈 + rotate: false + xy: 220, 14 + size: 158, 76 + orig: 158, 78 + offset: 0, 1 + index: -1 +效果1 + rotate: false + xy: 220, 92 + size: 185, 84 + orig: 205, 89 + offset: 11, 1 + index: -1 +效果2 + rotate: true + xy: 407, 53 + size: 123, 127 + orig: 138, 134 + offset: 8, 1 + index: -1 +连环马2 + rotate: true + xy: 380, 12 + size: 39, 81 + orig: 39, 81 + offset: 0, 0 + index: -1 diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/橙装掉落/橙装掉落.atlas.meta b/assets/res/battleGameWeapon/spine/装备掉落效果/橙装掉落/橙装掉落.atlas.meta new file mode 100644 index 0000000..42188f5 --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/橙装掉落/橙装掉落.atlas.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.0.0", + "importer": "*", + "imported": true, + "uuid": "6815abea-2e30-40f8-80db-dfc3975c7f70", + "files": [ + ".atlas", + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/橙装掉落/橙装掉落.json b/assets/res/battleGameWeapon/spine/装备掉落效果/橙装掉落/橙装掉落.json new file mode 100644 index 0000000..cccb217 --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/橙装掉落/橙装掉落.json @@ -0,0 +1 @@ +{"skeleton":{"hash":"0hJHCGSoew3agWufEnw+dxRhDjo","spine":"3.8.75","x":-106.41,"y":-51.96,"width":205.99,"height":205.38},"bones":[{"name":"root"},{"name":"bone","parent":"root","length":27.92,"rotation":-1.16,"x":-2.82,"y":-5.25},{"name":"装备掉落效果","parent":"bone","length":33.24,"rotation":-89.5,"x":-0.72,"y":-0.91},{"name":"效果1","parent":"root","length":43.31,"rotation":2.47,"x":-0.78,"y":-21.73,"scaleY":1.2349},{"name":"效果2","parent":"root","length":66.03,"rotation":-179.03,"x":-2.17,"y":-17.22,"scaleY":1.3645},{"name":"装备掉落效果2","parent":"bone","length":33.24,"rotation":-89.5,"x":-0.72,"y":-0.91},{"name":"12131","parent":"root","length":16.43,"rotation":178.88,"x":-45.15,"y":29.4},{"name":"12132","parent":"root","length":16.43,"rotation":178.88,"x":16.56,"y":55.39,"scaleX":0.8368,"scaleY":0.8368},{"name":"12133","parent":"root","length":16.43,"rotation":178.88,"x":32.8,"y":16.41,"scaleX":1.0487,"scaleY":1.0487},{"name":"12134","parent":"root","length":16.43,"rotation":178.88,"x":-15.45,"y":45.64,"scaleX":1.0487,"scaleY":1.0487},{"name":"12135","parent":"root","length":16.43,"rotation":178.88,"x":-58.7,"y":29.4,"scaleX":0.6258,"scaleY":0.6258},{"name":"12136","parent":"root","length":16.43,"rotation":178.88,"x":65.28,"y":30.33,"scaleX":0.6258,"scaleY":0.6258},{"name":"12137","parent":"root","length":16.43,"rotation":178.88,"x":1.71,"y":29.4,"scaleX":0.6258,"scaleY":0.6258},{"name":"12138","parent":"root","length":16.43,"rotation":178.88,"x":-23.34,"y":-4.47,"scaleX":0.6258,"scaleY":0.6258},{"name":"12139","parent":"root","length":16.43,"rotation":178.88,"x":49.97,"y":39.61,"scaleX":0.6258,"scaleY":0.6258},{"name":"圈圈","parent":"root","length":23.5,"rotation":-90,"x":-0.77,"y":-16.55},{"name":"连环马","parent":"root","length":30.29,"rotation":-144.37,"x":3.54,"y":16.3,"scaleX":1.0662,"scaleY":1.0662}],"slots":[{"name":"圈圈","bone":"圈圈","attachment":"圈圈"},{"name":"装备掉落效果","bone":"装备掉落效果"},{"name":"装备掉落效果2","bone":"装备掉落效果2"},{"name":"效果1","bone":"效果1","attachment":"效果1"},{"name":"效果2","bone":"效果2","attachment":"效果2"},{"name":"12131","bone":"12131","attachment":"12131"},{"name":"12132","bone":"12132","attachment":"12131"},{"name":"12133","bone":"12133","attachment":"12131"},{"name":"12134","bone":"12134","attachment":"12131"},{"name":"12135","bone":"12135","attachment":"12131"},{"name":"12136","bone":"12136","attachment":"12131"},{"name":"12137","bone":"12137","attachment":"12131"},{"name":"12138","bone":"12138","attachment":"12131"},{"name":"12139","bone":"12139","attachment":"12131"},{"name":"连环马","bone":"连环马","attachment":"连环马2"}],"skins":[{"name":"default","attachments":{"圈圈":{"圈圈":{"x":-5.13,"y":-0.61,"rotation":-91.12,"width":158,"height":78}},"装备掉落效果":{"图层 4":{"x":-66.73,"y":6.8,"rotation":90.66,"width":192,"height":243}},"12131":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12132":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12133":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12134":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12135":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12136":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12137":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12138":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12139":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"效果1":{"效果1":{"x":-0.63,"y":37.79,"rotation":-2.47,"width":205,"height":89}},"效果2":{"效果2":{"x":1.58,"y":-57.78,"rotation":179.03,"width":138,"height":134}},"装备掉落效果2":{"图层 4":{"x":-66.73,"y":6.8,"rotation":90.66,"width":192,"height":243}},"连环马":{"连环马2":{"x":6.73,"y":-4.9,"rotation":-180,"width":39,"height":81}}}}],"animations":{"animation":{"slots":{"12131":{"color":[{"time":0.2333,"color":"ffffffff"},{"time":0.4333,"color":"ffffff00","curve":"stepped"},{"time":0.7667,"color":"ffffff00"},{"time":1,"color":"ffffffff"}]},"12134":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.1333,"color":"ffffff00"},{"time":0.3667,"color":"ffffffff","curve":"stepped"},{"time":0.6,"color":"ffffffff"},{"time":0.8,"color":"ffffff00"}]},"12138":{"color":[{"color":"ffffff00"},{"time":0.2333,"color":"ffffffff","curve":"stepped"},{"time":0.4667,"color":"ffffffff"},{"time":0.6667,"color":"ffffff00"}]},"12136":{"color":[{"time":0.1,"color":"ffffffff"},{"time":0.3,"color":"ffffff00","curve":"stepped"},{"time":0.6333,"color":"ffffff00"},{"time":0.8667,"color":"ffffffff"}]},"12135":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.2,"color":"ffffff00"},{"time":0.4333,"color":"ffffffff","curve":"stepped"},{"time":0.6667,"color":"ffffffff"},{"time":0.8667,"color":"ffffff00"}]},"装备掉落效果":{"color":[{"color":"ffffff00"},{"time":0.2667,"color":"ffffffff"},{"time":0.5,"color":"ffffff00","curve":"stepped"},{"time":0.5333,"color":"ffffff00"},{"time":0.8,"color":"ffffffff"},{"time":1,"color":"ffffff00"}],"attachment":[{"name":"图层 4"}]},"连环马":{"attachment":[{"name":null}]},"圈圈":{"color":[{"time":0.1667,"color":"ffffffff"},{"time":0.7667,"color":"ffffff00"}],"attachment":[{"name":null},{"time":0.1667,"name":"圈圈"}]},"12137":{"color":[{"color":"ffffff00"},{"time":0.2333,"color":"ffffffff","curve":"stepped"},{"time":0.4667,"color":"ffffffff"},{"time":0.6667,"color":"ffffff00"}]},"12133":{"color":[{"color":"ffffff91"},{"time":0.1,"color":"ffffffff","curve":"stepped"},{"time":0.3333,"color":"ffffffff"},{"time":0.5333,"color":"ffffff00","curve":"stepped"},{"time":0.8667,"color":"ffffff00"},{"time":1,"color":"ffffff91"}]},"12139":{"color":[{"color":"ffffffaa"},{"time":0.1333,"color":"ffffff00","curve":"stepped"},{"time":0.4667,"color":"ffffff00"},{"time":0.7,"color":"ffffffff","curve":"stepped"},{"time":0.9333,"color":"ffffffff"},{"time":1,"color":"ffffffaa"}]},"12132":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.2667,"color":"ffffff00"},{"time":0.5,"color":"ffffffff","curve":"stepped"},{"time":0.7333,"color":"ffffffff"},{"time":0.9333,"color":"ffffff00"}]},"装备掉落效果2":{"color":[{"color":"ffffffdf"},{"time":0.0333,"color":"ffffffff"},{"time":0.2667,"color":"ffffff00"},{"time":0.5,"color":"ffffffdf","curve":"stepped"},{"time":0.5333,"color":"ffffffdf"},{"time":0.5667,"color":"ffffffff"},{"time":0.8,"color":"ffffff00"},{"time":1,"color":"ffffffdf"}],"attachment":[{"name":"图层 4"}]}},"bones":{"root":{"rotate":[{"angle":-0.05}]},"装备掉落效果":{"translate":[{},{"time":0.5,"x":-0.55,"y":6.84},{"time":0.5333},{"time":1,"x":-0.55,"y":6.84}],"scale":[{"x":0.685},{"time":0.5,"x":1.532},{"time":0.5333,"x":0.685},{"time":1,"x":1.532}]},"效果2":{"scale":[{},{"time":0.2667,"y":1.577},{"time":0.5},{"time":0.7667,"y":1.577},{"time":1}]},"效果1":{"scale":[{},{"time":0.2667,"x":1.361},{"time":0.5},{"time":0.7667,"x":1.361},{"time":1}]},"装备掉落效果2":{"translate":[{"x":-0.27,"y":3.42},{"time":0.2333,"x":-0.55,"y":6.84},{"time":0.2667},{"time":0.5,"x":-0.27,"y":3.42,"curve":"stepped"},{"time":0.5333,"x":-0.27,"y":3.42},{"time":0.7667,"x":-0.55,"y":6.84},{"time":0.8},{"time":1,"x":-0.27,"y":3.42}],"scale":[{"x":1.109},{"time":0.2333,"x":1.532},{"time":0.2667,"x":0.685},{"time":0.5,"x":1.109,"curve":"stepped"},{"time":0.5333,"x":1.109},{"time":0.7667,"x":1.532},{"time":0.8,"x":0.685},{"time":1,"x":1.109}]},"12131":{"translate":[{"x":-10.63,"y":8.71},{"time":0.4333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.7667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.63,"y":8.71}]},"12132":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.2667,"x":-10.59,"y":-34.65},{"time":0.9333,"x":-10.71,"y":89.24}]},"12133":{"translate":[{"x":-10.62,"y":-9.87},{"time":0.5333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.8667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.62,"y":-9.87}]},"12134":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.1333,"x":-10.59,"y":-34.65},{"time":0.8,"x":-10.71,"y":89.24}]},"12135":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.2,"x":-10.59,"y":-34.65},{"time":0.8667,"x":-10.71,"y":89.24}]},"12136":{"translate":[{"x":-10.66,"y":33.49},{"time":0.3,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.6333,"x":-10.59,"y":-34.65},{"time":1,"x":-10.66,"y":33.49}]},"12137":{"translate":[{"x":-10.59,"y":-34.65},{"time":0.6667,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":1,"x":-10.59,"y":-34.65}]},"12138":{"translate":[{"x":-10.59,"y":-34.65},{"time":0.6667,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":1,"x":-10.59,"y":-34.65}]},"12139":{"translate":[{"x":-10.69,"y":64.46},{"time":0.1333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.4667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.69,"y":64.46}]},"圈圈":{"scale":[{"time":0.1667,"x":0.505,"y":0.505},{"time":0.7667,"x":1.367,"y":1.367}]},"连环马":{"translate":[{"x":2.92,"y":0.39,"curve":0.25,"c3":0.75},{"time":0.5,"x":2.91,"y":11.24,"curve":0.25,"c3":0.75},{"time":1,"x":2.92,"y":0.39}],"scale":[{"x":1.111,"y":1.111}]}}},"效果预览":{"slots":{"12131":{"color":[{"time":0.2333,"color":"ffffffff"},{"time":0.4333,"color":"ffffff00","curve":"stepped"},{"time":0.7667,"color":"ffffff00"},{"time":1,"color":"ffffffff"}]},"12134":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.1333,"color":"ffffff00"},{"time":0.3667,"color":"ffffffff","curve":"stepped"},{"time":0.6,"color":"ffffffff"},{"time":0.8,"color":"ffffff00"}]},"12138":{"color":[{"color":"ffffff00"},{"time":0.2333,"color":"ffffffff","curve":"stepped"},{"time":0.4667,"color":"ffffffff"},{"time":0.6667,"color":"ffffff00"}]},"12136":{"color":[{"time":0.1,"color":"ffffffff"},{"time":0.3,"color":"ffffff00","curve":"stepped"},{"time":0.6333,"color":"ffffff00"},{"time":0.8667,"color":"ffffffff"}]},"12135":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.2,"color":"ffffff00"},{"time":0.4333,"color":"ffffffff","curve":"stepped"},{"time":0.6667,"color":"ffffffff"},{"time":0.8667,"color":"ffffff00"}]},"装备掉落效果":{"color":[{"color":"ffffff00"},{"time":0.2667,"color":"ffffffff"},{"time":0.5,"color":"ffffff00","curve":"stepped"},{"time":0.5333,"color":"ffffff00"},{"time":0.8,"color":"ffffffff"},{"time":1,"color":"ffffff00"}],"attachment":[{"name":"图层 4"}]},"圈圈":{"color":[{"time":0.1667,"color":"ffffffff"},{"time":0.7667,"color":"ffffff00"}],"attachment":[{"name":null},{"time":0.1667,"name":"圈圈"}]},"12137":{"color":[{"color":"ffffff00"},{"time":0.2333,"color":"ffffffff","curve":"stepped"},{"time":0.4667,"color":"ffffffff"},{"time":0.6667,"color":"ffffff00"}]},"12133":{"color":[{"color":"ffffff91"},{"time":0.1,"color":"ffffffff","curve":"stepped"},{"time":0.3333,"color":"ffffffff"},{"time":0.5333,"color":"ffffff00","curve":"stepped"},{"time":0.8667,"color":"ffffff00"},{"time":1,"color":"ffffff91"}]},"12139":{"color":[{"color":"ffffffaa"},{"time":0.1333,"color":"ffffff00","curve":"stepped"},{"time":0.4667,"color":"ffffff00"},{"time":0.7,"color":"ffffffff","curve":"stepped"},{"time":0.9333,"color":"ffffffff"},{"time":1,"color":"ffffffaa"}]},"12132":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.2667,"color":"ffffff00"},{"time":0.5,"color":"ffffffff","curve":"stepped"},{"time":0.7333,"color":"ffffffff"},{"time":0.9333,"color":"ffffff00"}]},"装备掉落效果2":{"color":[{"color":"ffffffdf"},{"time":0.0333,"color":"ffffffff"},{"time":0.2667,"color":"ffffff00"},{"time":0.5,"color":"ffffffdf","curve":"stepped"},{"time":0.5333,"color":"ffffffdf"},{"time":0.5667,"color":"ffffffff"},{"time":0.8,"color":"ffffff00"},{"time":1,"color":"ffffffdf"}],"attachment":[{"name":"图层 4"}]}},"bones":{"root":{"rotate":[{"angle":-0.05}]},"装备掉落效果":{"translate":[{},{"time":0.5,"x":-0.55,"y":6.84},{"time":0.5333},{"time":1,"x":-0.55,"y":6.84}],"scale":[{"x":0.685},{"time":0.5,"x":1.532},{"time":0.5333,"x":0.685},{"time":1,"x":1.532}]},"效果2":{"scale":[{},{"time":0.2667,"y":1.577},{"time":0.5},{"time":0.7667,"y":1.577},{"time":1}]},"效果1":{"scale":[{},{"time":0.2667,"x":1.361},{"time":0.5},{"time":0.7667,"x":1.361},{"time":1}]},"装备掉落效果2":{"translate":[{"x":-0.27,"y":3.42},{"time":0.2333,"x":-0.55,"y":6.84},{"time":0.2667},{"time":0.5,"x":-0.27,"y":3.42,"curve":"stepped"},{"time":0.5333,"x":-0.27,"y":3.42},{"time":0.7667,"x":-0.55,"y":6.84},{"time":0.8},{"time":1,"x":-0.27,"y":3.42}],"scale":[{"x":1.109},{"time":0.2333,"x":1.532},{"time":0.2667,"x":0.685},{"time":0.5,"x":1.109,"curve":"stepped"},{"time":0.5333,"x":1.109},{"time":0.7667,"x":1.532},{"time":0.8,"x":0.685},{"time":1,"x":1.109}]},"12131":{"translate":[{"x":-10.63,"y":8.71},{"time":0.4333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.7667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.63,"y":8.71}]},"12132":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.2667,"x":-10.59,"y":-34.65},{"time":0.9333,"x":-10.71,"y":89.24}]},"12133":{"translate":[{"x":-10.62,"y":-9.87},{"time":0.5333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.8667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.62,"y":-9.87}]},"12134":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.1333,"x":-10.59,"y":-34.65},{"time":0.8,"x":-10.71,"y":89.24}]},"12135":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.2,"x":-10.59,"y":-34.65},{"time":0.8667,"x":-10.71,"y":89.24}]},"12136":{"translate":[{"x":-10.66,"y":33.49},{"time":0.3,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.6333,"x":-10.59,"y":-34.65},{"time":1,"x":-10.66,"y":33.49}]},"12137":{"translate":[{"x":-10.59,"y":-34.65},{"time":0.6667,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":1,"x":-10.59,"y":-34.65}]},"12138":{"translate":[{"x":-10.59,"y":-34.65},{"time":0.6667,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":1,"x":-10.59,"y":-34.65}]},"12139":{"translate":[{"x":-10.69,"y":64.46},{"time":0.1333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.4667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.69,"y":64.46}]},"圈圈":{"scale":[{"time":0.1667,"x":0.505,"y":0.505},{"time":0.7667,"x":1.367,"y":1.367}]},"连环马":{"translate":[{"x":2.92,"y":0.39,"curve":0.25,"c3":0.75},{"time":0.5,"x":2.91,"y":11.24,"curve":0.25,"c3":0.75},{"time":1,"x":2.92,"y":0.39}],"scale":[{"x":1.111,"y":1.111}]}}}}} \ No newline at end of file diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/橙装掉落/橙装掉落.json.meta b/assets/res/battleGameWeapon/spine/装备掉落效果/橙装掉落/橙装掉落.json.meta new file mode 100644 index 0000000..64a3041 --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/橙装掉落/橙装掉落.json.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.2.7", + "importer": "spine-data", + "imported": true, + "uuid": "a5c692b3-1b31-4447-a831-b0791c57cd67", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "atlasUuid": "6815abea-2e30-40f8-80db-dfc3975c7f70" + } +} diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/橙装掉落/橙装掉落.png b/assets/res/battleGameWeapon/spine/装备掉落效果/橙装掉落/橙装掉落.png new file mode 100644 index 0000000..9f3b839 Binary files /dev/null and b/assets/res/battleGameWeapon/spine/装备掉落效果/橙装掉落/橙装掉落.png differ diff --git a/assets/res/gemstone/texture/框-大-2.png.meta b/assets/res/battleGameWeapon/spine/装备掉落效果/橙装掉落/橙装掉落.png.meta similarity index 70% rename from assets/res/gemstone/texture/框-大-2.png.meta rename to assets/res/battleGameWeapon/spine/装备掉落效果/橙装掉落/橙装掉落.png.meta index 8d2d068..43176e4 100644 --- a/assets/res/gemstone/texture/框-大-2.png.meta +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/橙装掉落/橙装掉落.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "7547a386-2a6c-46b9-82b5-0bcc79a288d5", + "uuid": "bea33535-d054-49d8-ab4c-4ea842f1650d", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "7547a386-2a6c-46b9-82b5-0bcc79a288d5@6c48a", - "displayName": "框-大-2", + "uuid": "bea33535-d054-49d8-ab4c-4ea842f1650d@6c48a", + "displayName": "橙装掉落", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "7547a386-2a6c-46b9-82b5-0bcc79a288d5", + "imageUuidOrDatabaseUri": "bea33535-d054-49d8-ab4c-4ea842f1650d", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "7547a386-2a6c-46b9-82b5-0bcc79a288d5@f9941", - "displayName": "框-大-2", + "uuid": "bea33535-d054-49d8-ab4c-4ea842f1650d@f9941", + "displayName": "橙装掉落", "id": "f9941", "name": "spriteFrame", "userData": { @@ -45,10 +45,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 101, - "height": 102, - "rawWidth": 101, - "rawHeight": 102, + "width": 534, + "height": 176, + "rawWidth": 534, + "rawHeight": 176, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -50.5, - -51, + -267, + -88, 0, - 50.5, - -51, + 267, + -88, 0, - -50.5, - 51, + -267, + 88, 0, - 50.5, - 51, + 267, + 88, 0 ], "indexes": [ @@ -83,12 +83,12 @@ ], "uv": [ 0, - 102, - 101, - 102, + 176, + 534, + 176, 0, 0, - 101, + 534, 0 ], "nuv": [ @@ -102,18 +102,18 @@ 1 ], "minPos": [ - -50.5, - -51, + -267, + -88, 0 ], "maxPos": [ - 50.5, - 51, + 267, + 88, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "7547a386-2a6c-46b9-82b5-0bcc79a288d5@6c48a", + "imageUuidOrDatabaseUri": "bea33535-d054-49d8-ab4c-4ea842f1650d@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "7547a386-2a6c-46b9-82b5-0bcc79a288d5@6c48a" + "redirect": "bea33535-d054-49d8-ab4c-4ea842f1650d@6c48a" } } diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/紫装掉落.meta b/assets/res/battleGameWeapon/spine/装备掉落效果/紫装掉落.meta new file mode 100644 index 0000000..f39c621 --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/紫装掉落.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "aef94ea0-c648-4bc4-9c16-06d747de017d", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/紫装掉落/紫装掉落.atlas b/assets/res/battleGameWeapon/spine/装备掉落效果/紫装掉落/紫装掉落.atlas new file mode 100644 index 0000000..7bf220b --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/紫装掉落/紫装掉落.atlas @@ -0,0 +1,48 @@ + +紫装掉落.png +size: 534,176 +format: RGBA8888 +filter: Linear,Linear +repeat: none +12131 + rotate: true + xy: 220, 0 + size: 12, 141 + orig: 12, 145 + offset: 0, 2 + index: -1 +图层 4 + rotate: true + xy: 0, 0 + size: 176, 218 + orig: 192, 243 + offset: 15, 2 + index: -1 +圈圈 + rotate: false + xy: 220, 14 + size: 158, 76 + orig: 158, 78 + offset: 0, 1 + index: -1 +效果1 + rotate: false + xy: 220, 92 + size: 185, 84 + orig: 205, 89 + offset: 11, 1 + index: -1 +效果2 + rotate: true + xy: 407, 53 + size: 123, 127 + orig: 138, 134 + offset: 8, 1 + index: -1 +连环马2 + rotate: true + xy: 380, 12 + size: 39, 81 + orig: 39, 81 + offset: 0, 0 + index: -1 diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/紫装掉落/紫装掉落.atlas.meta b/assets/res/battleGameWeapon/spine/装备掉落效果/紫装掉落/紫装掉落.atlas.meta new file mode 100644 index 0000000..759b57c --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/紫装掉落/紫装掉落.atlas.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.0.0", + "importer": "*", + "imported": true, + "uuid": "c6a5721e-eb1d-49fc-9f9a-d0840a043509", + "files": [ + ".atlas", + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/紫装掉落/紫装掉落.json b/assets/res/battleGameWeapon/spine/装备掉落效果/紫装掉落/紫装掉落.json new file mode 100644 index 0000000..fbfb4c8 --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/紫装掉落/紫装掉落.json @@ -0,0 +1 @@ +{"skeleton":{"hash":"7h6X9LYhGq8rVBR43OQz5ZzwFA4","spine":"3.8.75","x":-106.41,"y":-51.96,"width":205.99,"height":205.38},"bones":[{"name":"root"},{"name":"bone","parent":"root","length":27.92,"rotation":-1.16,"x":-2.82,"y":-5.25},{"name":"装备掉落效果","parent":"bone","length":33.24,"rotation":-89.5,"x":-0.72,"y":-0.91},{"name":"效果1","parent":"root","length":43.31,"rotation":2.47,"x":-0.78,"y":-21.73,"scaleY":1.2349},{"name":"效果2","parent":"root","length":66.03,"rotation":-179.03,"x":-2.17,"y":-17.22,"scaleY":1.3645},{"name":"装备掉落效果2","parent":"bone","length":33.24,"rotation":-89.5,"x":-0.72,"y":-0.91},{"name":"12131","parent":"root","length":16.43,"rotation":178.88,"x":-45.15,"y":29.4},{"name":"12132","parent":"root","length":16.43,"rotation":178.88,"x":16.56,"y":55.39,"scaleX":0.8368,"scaleY":0.8368},{"name":"12133","parent":"root","length":16.43,"rotation":178.88,"x":32.8,"y":16.41,"scaleX":1.0487,"scaleY":1.0487},{"name":"12134","parent":"root","length":16.43,"rotation":178.88,"x":-15.45,"y":45.64,"scaleX":1.0487,"scaleY":1.0487},{"name":"12135","parent":"root","length":16.43,"rotation":178.88,"x":-58.7,"y":29.4,"scaleX":0.6258,"scaleY":0.6258},{"name":"12136","parent":"root","length":16.43,"rotation":178.88,"x":65.28,"y":30.33,"scaleX":0.6258,"scaleY":0.6258},{"name":"12137","parent":"root","length":16.43,"rotation":178.88,"x":1.71,"y":29.4,"scaleX":0.6258,"scaleY":0.6258},{"name":"12138","parent":"root","length":16.43,"rotation":178.88,"x":-23.34,"y":-4.47,"scaleX":0.6258,"scaleY":0.6258},{"name":"12139","parent":"root","length":16.43,"rotation":178.88,"x":49.97,"y":39.61,"scaleX":0.6258,"scaleY":0.6258},{"name":"圈圈","parent":"root","length":23.5,"rotation":-90,"x":-0.77,"y":-16.55},{"name":"连环马","parent":"root","length":30.29,"rotation":-144.37,"x":3.54,"y":16.3,"scaleX":1.0662,"scaleY":1.0662}],"slots":[{"name":"圈圈","bone":"圈圈","attachment":"圈圈"},{"name":"装备掉落效果","bone":"装备掉落效果"},{"name":"装备掉落效果2","bone":"装备掉落效果2"},{"name":"效果1","bone":"效果1","attachment":"效果1"},{"name":"效果2","bone":"效果2","attachment":"效果2"},{"name":"12131","bone":"12131","attachment":"12131"},{"name":"12132","bone":"12132","attachment":"12131"},{"name":"12133","bone":"12133","attachment":"12131"},{"name":"12134","bone":"12134","attachment":"12131"},{"name":"12135","bone":"12135","attachment":"12131"},{"name":"12136","bone":"12136","attachment":"12131"},{"name":"12137","bone":"12137","attachment":"12131"},{"name":"12138","bone":"12138","attachment":"12131"},{"name":"12139","bone":"12139","attachment":"12131"},{"name":"连环马","bone":"连环马","attachment":"连环马2"}],"skins":[{"name":"default","attachments":{"圈圈":{"圈圈":{"x":-5.13,"y":-0.61,"rotation":-91.12,"width":158,"height":78}},"装备掉落效果":{"图层 4":{"x":-66.73,"y":6.8,"rotation":90.66,"width":192,"height":243}},"12131":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12132":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12133":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12134":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12135":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12136":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12137":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12138":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12139":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"效果1":{"效果1":{"x":-0.63,"y":37.79,"rotation":-2.47,"width":205,"height":89}},"效果2":{"效果2":{"x":1.58,"y":-57.78,"rotation":179.03,"width":138,"height":134}},"装备掉落效果2":{"图层 4":{"x":-66.73,"y":6.8,"rotation":90.66,"width":192,"height":243}},"连环马":{"连环马2":{"x":6.73,"y":-4.9,"rotation":-180,"width":39,"height":81}}}}],"animations":{"animation":{"slots":{"圈圈":{"color":[{"time":0.1667,"color":"ffffffff"},{"time":0.7667,"color":"ffffff00"}],"attachment":[{"name":null},{"time":0.1667,"name":"圈圈"}]},"12135":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.2,"color":"ffffff00"},{"time":0.4333,"color":"ffffffff","curve":"stepped"},{"time":0.6667,"color":"ffffffff"},{"time":0.8667,"color":"ffffff00"}]},"12138":{"color":[{"color":"ffffff00"},{"time":0.2333,"color":"ffffffff","curve":"stepped"},{"time":0.4667,"color":"ffffffff"},{"time":0.6667,"color":"ffffff00"}]},"12134":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.1333,"color":"ffffff00"},{"time":0.3667,"color":"ffffffff","curve":"stepped"},{"time":0.6,"color":"ffffffff"},{"time":0.8,"color":"ffffff00"}]},"装备掉落效果2":{"color":[{"color":"ffffffdf"},{"time":0.0333,"color":"ffffffff"},{"time":0.2667,"color":"ffffff00"},{"time":0.5,"color":"ffffffdf","curve":"stepped"},{"time":0.5333,"color":"ffffffdf"},{"time":0.5667,"color":"ffffffff"},{"time":0.8,"color":"ffffff00"},{"time":1,"color":"ffffffdf"}],"attachment":[{"name":"图层 4"}]},"12133":{"color":[{"color":"ffffff91"},{"time":0.1,"color":"ffffffff","curve":"stepped"},{"time":0.3333,"color":"ffffffff"},{"time":0.5333,"color":"ffffff00","curve":"stepped"},{"time":0.8667,"color":"ffffff00"},{"time":1,"color":"ffffff91"}]},"12137":{"color":[{"color":"ffffff00"},{"time":0.2333,"color":"ffffffff","curve":"stepped"},{"time":0.4667,"color":"ffffffff"},{"time":0.6667,"color":"ffffff00"}]},"12132":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.2667,"color":"ffffff00"},{"time":0.5,"color":"ffffffff","curve":"stepped"},{"time":0.7333,"color":"ffffffff"},{"time":0.9333,"color":"ffffff00"}]},"12139":{"color":[{"color":"ffffffaa"},{"time":0.1333,"color":"ffffff00","curve":"stepped"},{"time":0.4667,"color":"ffffff00"},{"time":0.7,"color":"ffffffff","curve":"stepped"},{"time":0.9333,"color":"ffffffff"},{"time":1,"color":"ffffffaa"}]},"连环马":{"attachment":[{"name":null}]},"12131":{"color":[{"time":0.2333,"color":"ffffffff"},{"time":0.4333,"color":"ffffff00","curve":"stepped"},{"time":0.7667,"color":"ffffff00"},{"time":1,"color":"ffffffff"}]},"12136":{"color":[{"time":0.1,"color":"ffffffff"},{"time":0.3,"color":"ffffff00","curve":"stepped"},{"time":0.6333,"color":"ffffff00"},{"time":0.8667,"color":"ffffffff"}]},"装备掉落效果":{"color":[{"color":"ffffff00"},{"time":0.2667,"color":"ffffffff"},{"time":0.5,"color":"ffffff00","curve":"stepped"},{"time":0.5333,"color":"ffffff00"},{"time":0.8,"color":"ffffffff"},{"time":1,"color":"ffffff00"}],"attachment":[{"name":"图层 4"}]}},"bones":{"root":{"rotate":[{"angle":-0.05}]},"装备掉落效果":{"translate":[{},{"time":0.5,"x":-0.55,"y":6.84},{"time":0.5333},{"time":1,"x":-0.55,"y":6.84}],"scale":[{"x":0.685},{"time":0.5,"x":1.532},{"time":0.5333,"x":0.685},{"time":1,"x":1.532}]},"效果2":{"scale":[{},{"time":0.2667,"y":1.577},{"time":0.5},{"time":0.7667,"y":1.577},{"time":1}]},"效果1":{"scale":[{},{"time":0.2667,"x":1.361},{"time":0.5},{"time":0.7667,"x":1.361},{"time":1}]},"装备掉落效果2":{"translate":[{"x":-0.27,"y":3.42},{"time":0.2333,"x":-0.55,"y":6.84},{"time":0.2667},{"time":0.5,"x":-0.27,"y":3.42,"curve":"stepped"},{"time":0.5333,"x":-0.27,"y":3.42},{"time":0.7667,"x":-0.55,"y":6.84},{"time":0.8},{"time":1,"x":-0.27,"y":3.42}],"scale":[{"x":1.109},{"time":0.2333,"x":1.532},{"time":0.2667,"x":0.685},{"time":0.5,"x":1.109,"curve":"stepped"},{"time":0.5333,"x":1.109},{"time":0.7667,"x":1.532},{"time":0.8,"x":0.685},{"time":1,"x":1.109}]},"12131":{"translate":[{"x":-10.63,"y":8.71},{"time":0.4333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.7667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.63,"y":8.71}]},"12132":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.2667,"x":-10.59,"y":-34.65},{"time":0.9333,"x":-10.71,"y":89.24}]},"12133":{"translate":[{"x":-10.62,"y":-9.87},{"time":0.5333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.8667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.62,"y":-9.87}]},"12134":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.1333,"x":-10.59,"y":-34.65},{"time":0.8,"x":-10.71,"y":89.24}]},"12135":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.2,"x":-10.59,"y":-34.65},{"time":0.8667,"x":-10.71,"y":89.24}]},"12136":{"translate":[{"x":-10.66,"y":33.49},{"time":0.3,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.6333,"x":-10.59,"y":-34.65},{"time":1,"x":-10.66,"y":33.49}]},"12137":{"translate":[{"x":-10.59,"y":-34.65},{"time":0.6667,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":1,"x":-10.59,"y":-34.65}]},"12138":{"translate":[{"x":-10.59,"y":-34.65},{"time":0.6667,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":1,"x":-10.59,"y":-34.65}]},"12139":{"translate":[{"x":-10.69,"y":64.46},{"time":0.1333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.4667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.69,"y":64.46}]},"圈圈":{"scale":[{"time":0.1667,"x":0.505,"y":0.505},{"time":0.7667,"x":1.367,"y":1.367}]},"连环马":{"translate":[{"x":2.92,"y":0.39,"curve":0.25,"c3":0.75},{"time":0.5,"x":2.91,"y":11.24,"curve":0.25,"c3":0.75},{"time":1,"x":2.92,"y":0.39}],"scale":[{"x":1.111,"y":1.111}]}}},"效果预览":{"slots":{"圈圈":{"color":[{"time":0.1667,"color":"ffffffff"},{"time":0.7667,"color":"ffffff00"}],"attachment":[{"name":null},{"time":0.1667,"name":"圈圈"}]},"12135":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.2,"color":"ffffff00"},{"time":0.4333,"color":"ffffffff","curve":"stepped"},{"time":0.6667,"color":"ffffffff"},{"time":0.8667,"color":"ffffff00"}]},"12138":{"color":[{"color":"ffffff00"},{"time":0.2333,"color":"ffffffff","curve":"stepped"},{"time":0.4667,"color":"ffffffff"},{"time":0.6667,"color":"ffffff00"}]},"12134":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.1333,"color":"ffffff00"},{"time":0.3667,"color":"ffffffff","curve":"stepped"},{"time":0.6,"color":"ffffffff"},{"time":0.8,"color":"ffffff00"}]},"装备掉落效果2":{"color":[{"color":"ffffffdf"},{"time":0.0333,"color":"ffffffff"},{"time":0.2667,"color":"ffffff00"},{"time":0.5,"color":"ffffffdf","curve":"stepped"},{"time":0.5333,"color":"ffffffdf"},{"time":0.5667,"color":"ffffffff"},{"time":0.8,"color":"ffffff00"},{"time":1,"color":"ffffffdf"}],"attachment":[{"name":"图层 4"}]},"12133":{"color":[{"color":"ffffff91"},{"time":0.1,"color":"ffffffff","curve":"stepped"},{"time":0.3333,"color":"ffffffff"},{"time":0.5333,"color":"ffffff00","curve":"stepped"},{"time":0.8667,"color":"ffffff00"},{"time":1,"color":"ffffff91"}]},"12137":{"color":[{"color":"ffffff00"},{"time":0.2333,"color":"ffffffff","curve":"stepped"},{"time":0.4667,"color":"ffffffff"},{"time":0.6667,"color":"ffffff00"}]},"12132":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.2667,"color":"ffffff00"},{"time":0.5,"color":"ffffffff","curve":"stepped"},{"time":0.7333,"color":"ffffffff"},{"time":0.9333,"color":"ffffff00"}]},"12139":{"color":[{"color":"ffffffaa"},{"time":0.1333,"color":"ffffff00","curve":"stepped"},{"time":0.4667,"color":"ffffff00"},{"time":0.7,"color":"ffffffff","curve":"stepped"},{"time":0.9333,"color":"ffffffff"},{"time":1,"color":"ffffffaa"}]},"12131":{"color":[{"time":0.2333,"color":"ffffffff"},{"time":0.4333,"color":"ffffff00","curve":"stepped"},{"time":0.7667,"color":"ffffff00"},{"time":1,"color":"ffffffff"}]},"12136":{"color":[{"time":0.1,"color":"ffffffff"},{"time":0.3,"color":"ffffff00","curve":"stepped"},{"time":0.6333,"color":"ffffff00"},{"time":0.8667,"color":"ffffffff"}]},"装备掉落效果":{"color":[{"color":"ffffff00"},{"time":0.2667,"color":"ffffffff"},{"time":0.5,"color":"ffffff00","curve":"stepped"},{"time":0.5333,"color":"ffffff00"},{"time":0.8,"color":"ffffffff"},{"time":1,"color":"ffffff00"}],"attachment":[{"name":"图层 4"}]}},"bones":{"root":{"rotate":[{"angle":-0.05}]},"装备掉落效果":{"translate":[{},{"time":0.5,"x":-0.55,"y":6.84},{"time":0.5333},{"time":1,"x":-0.55,"y":6.84}],"scale":[{"x":0.685},{"time":0.5,"x":1.532},{"time":0.5333,"x":0.685},{"time":1,"x":1.532}]},"效果2":{"scale":[{},{"time":0.2667,"y":1.577},{"time":0.5},{"time":0.7667,"y":1.577},{"time":1}]},"效果1":{"scale":[{},{"time":0.2667,"x":1.361},{"time":0.5},{"time":0.7667,"x":1.361},{"time":1}]},"装备掉落效果2":{"translate":[{"x":-0.27,"y":3.42},{"time":0.2333,"x":-0.55,"y":6.84},{"time":0.2667},{"time":0.5,"x":-0.27,"y":3.42,"curve":"stepped"},{"time":0.5333,"x":-0.27,"y":3.42},{"time":0.7667,"x":-0.55,"y":6.84},{"time":0.8},{"time":1,"x":-0.27,"y":3.42}],"scale":[{"x":1.109},{"time":0.2333,"x":1.532},{"time":0.2667,"x":0.685},{"time":0.5,"x":1.109,"curve":"stepped"},{"time":0.5333,"x":1.109},{"time":0.7667,"x":1.532},{"time":0.8,"x":0.685},{"time":1,"x":1.109}]},"12131":{"translate":[{"x":-10.63,"y":8.71},{"time":0.4333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.7667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.63,"y":8.71}]},"12132":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.2667,"x":-10.59,"y":-34.65},{"time":0.9333,"x":-10.71,"y":89.24}]},"12133":{"translate":[{"x":-10.62,"y":-9.87},{"time":0.5333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.8667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.62,"y":-9.87}]},"12134":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.1333,"x":-10.59,"y":-34.65},{"time":0.8,"x":-10.71,"y":89.24}]},"12135":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.2,"x":-10.59,"y":-34.65},{"time":0.8667,"x":-10.71,"y":89.24}]},"12136":{"translate":[{"x":-10.66,"y":33.49},{"time":0.3,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.6333,"x":-10.59,"y":-34.65},{"time":1,"x":-10.66,"y":33.49}]},"12137":{"translate":[{"x":-10.59,"y":-34.65},{"time":0.6667,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":1,"x":-10.59,"y":-34.65}]},"12138":{"translate":[{"x":-10.59,"y":-34.65},{"time":0.6667,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":1,"x":-10.59,"y":-34.65}]},"12139":{"translate":[{"x":-10.69,"y":64.46},{"time":0.1333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.4667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.69,"y":64.46}]},"圈圈":{"scale":[{"time":0.1667,"x":0.505,"y":0.505},{"time":0.7667,"x":1.367,"y":1.367}]},"连环马":{"translate":[{"x":2.92,"y":0.39,"curve":0.25,"c3":0.75},{"time":0.5,"x":2.91,"y":11.24,"curve":0.25,"c3":0.75},{"time":1,"x":2.92,"y":0.39}],"scale":[{"x":1.111,"y":1.111}]}}}}} \ No newline at end of file diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/紫装掉落/紫装掉落.json.meta b/assets/res/battleGameWeapon/spine/装备掉落效果/紫装掉落/紫装掉落.json.meta new file mode 100644 index 0000000..55428ba --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/紫装掉落/紫装掉落.json.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.2.7", + "importer": "spine-data", + "imported": true, + "uuid": "91562814-0679-419f-a43f-9f607ec7d25b", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "atlasUuid": "c6a5721e-eb1d-49fc-9f9a-d0840a043509" + } +} diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/紫装掉落/紫装掉落.png b/assets/res/battleGameWeapon/spine/装备掉落效果/紫装掉落/紫装掉落.png new file mode 100644 index 0000000..86f65a1 Binary files /dev/null and b/assets/res/battleGameWeapon/spine/装备掉落效果/紫装掉落/紫装掉落.png differ diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/紫装掉落/紫装掉落.png.meta b/assets/res/battleGameWeapon/spine/装备掉落效果/紫装掉落/紫装掉落.png.meta new file mode 100644 index 0000000..70ab4b4 --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/紫装掉落/紫装掉落.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "9bfbdb1f-f7e5-4f9e-8ec4-3f7616ae3f91", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "9bfbdb1f-f7e5-4f9e-8ec4-3f7616ae3f91@6c48a", + "displayName": "紫装掉落", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "9bfbdb1f-f7e5-4f9e-8ec4-3f7616ae3f91", + "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": "9bfbdb1f-f7e5-4f9e-8ec4-3f7616ae3f91@f9941", + "displayName": "紫装掉落", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 534, + "height": 176, + "rawWidth": 534, + "rawHeight": 176, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -267, + -88, + 0, + 267, + -88, + 0, + -267, + 88, + 0, + 267, + 88, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 176, + 534, + 176, + 0, + 0, + 534, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -267, + -88, + 0 + ], + "maxPos": [ + 267, + 88, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "9bfbdb1f-f7e5-4f9e-8ec4-3f7616ae3f91@6c48a", + "atlasUuid": "", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "redirect": "9bfbdb1f-f7e5-4f9e-8ec4-3f7616ae3f91@6c48a" + } +} diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/绿装掉落.meta b/assets/res/battleGameWeapon/spine/装备掉落效果/绿装掉落.meta new file mode 100644 index 0000000..1552e66 --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/绿装掉落.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "078022f3-48e7-4116-b088-982bb39d5806", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/绿装掉落/绿装掉落.atlas b/assets/res/battleGameWeapon/spine/装备掉落效果/绿装掉落/绿装掉落.atlas new file mode 100644 index 0000000..668a9bd --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/绿装掉落/绿装掉落.atlas @@ -0,0 +1,48 @@ + +绿装掉落.png +size: 534,176 +format: RGBA8888 +filter: Linear,Linear +repeat: none +12131 + rotate: true + xy: 220, 0 + size: 12, 141 + orig: 12, 145 + offset: 0, 2 + index: -1 +图层 4 + rotate: true + xy: 0, 0 + size: 176, 218 + orig: 192, 243 + offset: 15, 2 + index: -1 +圈圈 + rotate: false + xy: 220, 14 + size: 158, 76 + orig: 158, 78 + offset: 0, 1 + index: -1 +效果1 + rotate: false + xy: 220, 92 + size: 185, 84 + orig: 205, 89 + offset: 11, 1 + index: -1 +效果2 + rotate: true + xy: 407, 53 + size: 123, 127 + orig: 138, 134 + offset: 8, 1 + index: -1 +连环马2 + rotate: true + xy: 380, 12 + size: 39, 81 + orig: 39, 81 + offset: 0, 0 + index: -1 diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/绿装掉落/绿装掉落.atlas.meta b/assets/res/battleGameWeapon/spine/装备掉落效果/绿装掉落/绿装掉落.atlas.meta new file mode 100644 index 0000000..37f2d70 --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/绿装掉落/绿装掉落.atlas.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.0.0", + "importer": "*", + "imported": true, + "uuid": "d60f8853-0a69-48a5-8d49-a0dfa38a50b8", + "files": [ + ".atlas", + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/绿装掉落/绿装掉落.json b/assets/res/battleGameWeapon/spine/装备掉落效果/绿装掉落/绿装掉落.json new file mode 100644 index 0000000..aa26276 --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/绿装掉落/绿装掉落.json @@ -0,0 +1 @@ +{"skeleton":{"hash":"MlTTv2pVKN2oB3PFc/eCwEtouyQ","spine":"3.8.75","x":-106.41,"y":-51.96,"width":205.99,"height":205.38},"bones":[{"name":"root"},{"name":"bone","parent":"root","length":27.92,"rotation":-1.16,"x":-2.82,"y":-5.25},{"name":"装备掉落效果","parent":"bone","length":33.24,"rotation":-89.5,"x":-0.72,"y":-0.91},{"name":"效果1","parent":"root","length":43.31,"rotation":2.47,"x":-0.78,"y":-21.73,"scaleY":1.2349},{"name":"效果2","parent":"root","length":66.03,"rotation":-179.03,"x":-2.17,"y":-17.22,"scaleY":1.3645},{"name":"装备掉落效果2","parent":"bone","length":33.24,"rotation":-89.5,"x":-0.72,"y":-0.91},{"name":"12131","parent":"root","length":16.43,"rotation":178.88,"x":-45.15,"y":29.4},{"name":"12132","parent":"root","length":16.43,"rotation":178.88,"x":16.56,"y":55.39,"scaleX":0.8368,"scaleY":0.8368},{"name":"12133","parent":"root","length":16.43,"rotation":178.88,"x":32.8,"y":16.41,"scaleX":1.0487,"scaleY":1.0487},{"name":"12134","parent":"root","length":16.43,"rotation":178.88,"x":-15.45,"y":45.64,"scaleX":1.0487,"scaleY":1.0487},{"name":"12135","parent":"root","length":16.43,"rotation":178.88,"x":-58.7,"y":29.4,"scaleX":0.6258,"scaleY":0.6258},{"name":"12136","parent":"root","length":16.43,"rotation":178.88,"x":65.28,"y":30.33,"scaleX":0.6258,"scaleY":0.6258},{"name":"12137","parent":"root","length":16.43,"rotation":178.88,"x":1.71,"y":29.4,"scaleX":0.6258,"scaleY":0.6258},{"name":"12138","parent":"root","length":16.43,"rotation":178.88,"x":-23.34,"y":-4.47,"scaleX":0.6258,"scaleY":0.6258},{"name":"12139","parent":"root","length":16.43,"rotation":178.88,"x":49.97,"y":39.61,"scaleX":0.6258,"scaleY":0.6258},{"name":"圈圈","parent":"root","length":23.5,"rotation":-90,"x":-0.77,"y":-16.55},{"name":"连环马","parent":"root","length":30.29,"rotation":-144.37,"x":3.54,"y":16.3,"scaleX":1.0662,"scaleY":1.0662}],"slots":[{"name":"圈圈","bone":"圈圈","attachment":"圈圈"},{"name":"装备掉落效果","bone":"装备掉落效果"},{"name":"装备掉落效果2","bone":"装备掉落效果2"},{"name":"效果1","bone":"效果1","attachment":"效果1"},{"name":"效果2","bone":"效果2","attachment":"效果2"},{"name":"12131","bone":"12131","attachment":"12131"},{"name":"12132","bone":"12132","attachment":"12131"},{"name":"12133","bone":"12133","attachment":"12131"},{"name":"12134","bone":"12134","attachment":"12131"},{"name":"12135","bone":"12135","attachment":"12131"},{"name":"12136","bone":"12136","attachment":"12131"},{"name":"12137","bone":"12137","attachment":"12131"},{"name":"12138","bone":"12138","attachment":"12131"},{"name":"12139","bone":"12139","attachment":"12131"},{"name":"连环马","bone":"连环马","attachment":"连环马2"}],"skins":[{"name":"default","attachments":{"圈圈":{"圈圈":{"x":-5.13,"y":-0.61,"rotation":-91.12,"width":158,"height":78}},"装备掉落效果":{"图层 4":{"x":-66.73,"y":6.8,"rotation":90.66,"width":192,"height":243}},"12131":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12132":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12133":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12134":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12135":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12136":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12137":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12138":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12139":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"效果1":{"效果1":{"x":-0.63,"y":37.79,"rotation":-2.47,"width":205,"height":89}},"效果2":{"效果2":{"x":1.58,"y":-57.78,"rotation":179.03,"width":138,"height":134}},"装备掉落效果2":{"图层 4":{"x":-66.73,"y":6.8,"rotation":90.66,"width":192,"height":243}},"连环马":{"连环马2":{"x":6.73,"y":-4.9,"rotation":-180,"width":39,"height":81}}}}],"animations":{"animation":{"slots":{"12135":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.2,"color":"ffffff00"},{"time":0.4333,"color":"ffffffff","curve":"stepped"},{"time":0.6667,"color":"ffffffff"},{"time":0.8667,"color":"ffffff00"}]},"装备掉落效果2":{"color":[{"color":"ffffffdf"},{"time":0.0333,"color":"ffffffff"},{"time":0.2667,"color":"ffffff00"},{"time":0.5,"color":"ffffffdf","curve":"stepped"},{"time":0.5333,"color":"ffffffdf"},{"time":0.5667,"color":"ffffffff"},{"time":0.8,"color":"ffffff00"},{"time":1,"color":"ffffffdf"}],"attachment":[{"name":"图层 4"}]},"装备掉落效果":{"color":[{"color":"ffffff00"},{"time":0.2667,"color":"ffffffff"},{"time":0.5,"color":"ffffff00","curve":"stepped"},{"time":0.5333,"color":"ffffff00"},{"time":0.8,"color":"ffffffff"},{"time":1,"color":"ffffff00"}],"attachment":[{"name":"图层 4"}]},"连环马":{"attachment":[{"name":null}]},"12137":{"color":[{"color":"ffffff00"},{"time":0.2333,"color":"ffffffff","curve":"stepped"},{"time":0.4667,"color":"ffffffff"},{"time":0.6667,"color":"ffffff00"}]},"12133":{"color":[{"color":"ffffff91"},{"time":0.1,"color":"ffffffff","curve":"stepped"},{"time":0.3333,"color":"ffffffff"},{"time":0.5333,"color":"ffffff00","curve":"stepped"},{"time":0.8667,"color":"ffffff00"},{"time":1,"color":"ffffff91"}]},"12132":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.2667,"color":"ffffff00"},{"time":0.5,"color":"ffffffff","curve":"stepped"},{"time":0.7333,"color":"ffffffff"},{"time":0.9333,"color":"ffffff00"}]},"12136":{"color":[{"time":0.1,"color":"ffffffff"},{"time":0.3,"color":"ffffff00","curve":"stepped"},{"time":0.6333,"color":"ffffff00"},{"time":0.8667,"color":"ffffffff"}]},"12131":{"color":[{"time":0.2333,"color":"ffffffff"},{"time":0.4333,"color":"ffffff00","curve":"stepped"},{"time":0.7667,"color":"ffffff00"},{"time":1,"color":"ffffffff"}]},"12134":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.1333,"color":"ffffff00"},{"time":0.3667,"color":"ffffffff","curve":"stepped"},{"time":0.6,"color":"ffffffff"},{"time":0.8,"color":"ffffff00"}]},"12139":{"color":[{"color":"ffffffaa"},{"time":0.1333,"color":"ffffff00","curve":"stepped"},{"time":0.4667,"color":"ffffff00"},{"time":0.7,"color":"ffffffff","curve":"stepped"},{"time":0.9333,"color":"ffffffff"},{"time":1,"color":"ffffffaa"}]},"圈圈":{"color":[{"time":0.1667,"color":"ffffffff"},{"time":0.7667,"color":"ffffff00"}],"attachment":[{"name":null},{"time":0.1667,"name":"圈圈"}]},"12138":{"color":[{"color":"ffffff00"},{"time":0.2333,"color":"ffffffff","curve":"stepped"},{"time":0.4667,"color":"ffffffff"},{"time":0.6667,"color":"ffffff00"}]}},"bones":{"root":{"rotate":[{"angle":-0.05}]},"装备掉落效果":{"translate":[{},{"time":0.5,"x":-0.55,"y":6.84},{"time":0.5333},{"time":1,"x":-0.55,"y":6.84}],"scale":[{"x":0.685},{"time":0.5,"x":1.532},{"time":0.5333,"x":0.685},{"time":1,"x":1.532}]},"效果2":{"scale":[{},{"time":0.2667,"y":1.577},{"time":0.5},{"time":0.7667,"y":1.577},{"time":1}]},"效果1":{"scale":[{},{"time":0.2667,"x":1.361},{"time":0.5},{"time":0.7667,"x":1.361},{"time":1}]},"装备掉落效果2":{"translate":[{"x":-0.27,"y":3.42},{"time":0.2333,"x":-0.55,"y":6.84},{"time":0.2667},{"time":0.5,"x":-0.27,"y":3.42,"curve":"stepped"},{"time":0.5333,"x":-0.27,"y":3.42},{"time":0.7667,"x":-0.55,"y":6.84},{"time":0.8},{"time":1,"x":-0.27,"y":3.42}],"scale":[{"x":1.109},{"time":0.2333,"x":1.532},{"time":0.2667,"x":0.685},{"time":0.5,"x":1.109,"curve":"stepped"},{"time":0.5333,"x":1.109},{"time":0.7667,"x":1.532},{"time":0.8,"x":0.685},{"time":1,"x":1.109}]},"12131":{"translate":[{"x":-10.63,"y":8.71},{"time":0.4333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.7667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.63,"y":8.71}]},"12132":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.2667,"x":-10.59,"y":-34.65},{"time":0.9333,"x":-10.71,"y":89.24}]},"12133":{"translate":[{"x":-10.62,"y":-9.87},{"time":0.5333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.8667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.62,"y":-9.87}]},"12134":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.1333,"x":-10.59,"y":-34.65},{"time":0.8,"x":-10.71,"y":89.24}]},"12135":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.2,"x":-10.59,"y":-34.65},{"time":0.8667,"x":-10.71,"y":89.24}]},"12136":{"translate":[{"x":-10.66,"y":33.49},{"time":0.3,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.6333,"x":-10.59,"y":-34.65},{"time":1,"x":-10.66,"y":33.49}]},"12137":{"translate":[{"x":-10.59,"y":-34.65},{"time":0.6667,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":1,"x":-10.59,"y":-34.65}]},"12138":{"translate":[{"x":-10.59,"y":-34.65},{"time":0.6667,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":1,"x":-10.59,"y":-34.65}]},"12139":{"translate":[{"x":-10.69,"y":64.46},{"time":0.1333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.4667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.69,"y":64.46}]},"圈圈":{"scale":[{"time":0.1667,"x":0.505,"y":0.505},{"time":0.7667,"x":1.367,"y":1.367}]},"连环马":{"translate":[{"x":2.92,"y":0.39,"curve":0.25,"c3":0.75},{"time":0.5,"x":2.91,"y":11.24,"curve":0.25,"c3":0.75},{"time":1,"x":2.92,"y":0.39}],"scale":[{"x":1.111,"y":1.111}]}}},"效果预览":{"slots":{"12135":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.2,"color":"ffffff00"},{"time":0.4333,"color":"ffffffff","curve":"stepped"},{"time":0.6667,"color":"ffffffff"},{"time":0.8667,"color":"ffffff00"}]},"装备掉落效果2":{"color":[{"color":"ffffffdf"},{"time":0.0333,"color":"ffffffff"},{"time":0.2667,"color":"ffffff00"},{"time":0.5,"color":"ffffffdf","curve":"stepped"},{"time":0.5333,"color":"ffffffdf"},{"time":0.5667,"color":"ffffffff"},{"time":0.8,"color":"ffffff00"},{"time":1,"color":"ffffffdf"}],"attachment":[{"name":"图层 4"}]},"装备掉落效果":{"color":[{"color":"ffffff00"},{"time":0.2667,"color":"ffffffff"},{"time":0.5,"color":"ffffff00","curve":"stepped"},{"time":0.5333,"color":"ffffff00"},{"time":0.8,"color":"ffffffff"},{"time":1,"color":"ffffff00"}],"attachment":[{"name":"图层 4"}]},"12137":{"color":[{"color":"ffffff00"},{"time":0.2333,"color":"ffffffff","curve":"stepped"},{"time":0.4667,"color":"ffffffff"},{"time":0.6667,"color":"ffffff00"}]},"12133":{"color":[{"color":"ffffff91"},{"time":0.1,"color":"ffffffff","curve":"stepped"},{"time":0.3333,"color":"ffffffff"},{"time":0.5333,"color":"ffffff00","curve":"stepped"},{"time":0.8667,"color":"ffffff00"},{"time":1,"color":"ffffff91"}]},"12132":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.2667,"color":"ffffff00"},{"time":0.5,"color":"ffffffff","curve":"stepped"},{"time":0.7333,"color":"ffffffff"},{"time":0.9333,"color":"ffffff00"}]},"12136":{"color":[{"time":0.1,"color":"ffffffff"},{"time":0.3,"color":"ffffff00","curve":"stepped"},{"time":0.6333,"color":"ffffff00"},{"time":0.8667,"color":"ffffffff"}]},"12131":{"color":[{"time":0.2333,"color":"ffffffff"},{"time":0.4333,"color":"ffffff00","curve":"stepped"},{"time":0.7667,"color":"ffffff00"},{"time":1,"color":"ffffffff"}]},"12134":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.1333,"color":"ffffff00"},{"time":0.3667,"color":"ffffffff","curve":"stepped"},{"time":0.6,"color":"ffffffff"},{"time":0.8,"color":"ffffff00"}]},"12139":{"color":[{"color":"ffffffaa"},{"time":0.1333,"color":"ffffff00","curve":"stepped"},{"time":0.4667,"color":"ffffff00"},{"time":0.7,"color":"ffffffff","curve":"stepped"},{"time":0.9333,"color":"ffffffff"},{"time":1,"color":"ffffffaa"}]},"圈圈":{"color":[{"time":0.1667,"color":"ffffffff"},{"time":0.7667,"color":"ffffff00"}],"attachment":[{"name":null},{"time":0.1667,"name":"圈圈"}]},"12138":{"color":[{"color":"ffffff00"},{"time":0.2333,"color":"ffffffff","curve":"stepped"},{"time":0.4667,"color":"ffffffff"},{"time":0.6667,"color":"ffffff00"}]}},"bones":{"root":{"rotate":[{"angle":-0.05}]},"装备掉落效果":{"translate":[{},{"time":0.5,"x":-0.55,"y":6.84},{"time":0.5333},{"time":1,"x":-0.55,"y":6.84}],"scale":[{"x":0.685},{"time":0.5,"x":1.532},{"time":0.5333,"x":0.685},{"time":1,"x":1.532}]},"效果2":{"scale":[{},{"time":0.2667,"y":1.577},{"time":0.5},{"time":0.7667,"y":1.577},{"time":1}]},"效果1":{"scale":[{},{"time":0.2667,"x":1.361},{"time":0.5},{"time":0.7667,"x":1.361},{"time":1}]},"装备掉落效果2":{"translate":[{"x":-0.27,"y":3.42},{"time":0.2333,"x":-0.55,"y":6.84},{"time":0.2667},{"time":0.5,"x":-0.27,"y":3.42,"curve":"stepped"},{"time":0.5333,"x":-0.27,"y":3.42},{"time":0.7667,"x":-0.55,"y":6.84},{"time":0.8},{"time":1,"x":-0.27,"y":3.42}],"scale":[{"x":1.109},{"time":0.2333,"x":1.532},{"time":0.2667,"x":0.685},{"time":0.5,"x":1.109,"curve":"stepped"},{"time":0.5333,"x":1.109},{"time":0.7667,"x":1.532},{"time":0.8,"x":0.685},{"time":1,"x":1.109}]},"12131":{"translate":[{"x":-10.63,"y":8.71},{"time":0.4333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.7667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.63,"y":8.71}]},"12132":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.2667,"x":-10.59,"y":-34.65},{"time":0.9333,"x":-10.71,"y":89.24}]},"12133":{"translate":[{"x":-10.62,"y":-9.87},{"time":0.5333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.8667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.62,"y":-9.87}]},"12134":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.1333,"x":-10.59,"y":-34.65},{"time":0.8,"x":-10.71,"y":89.24}]},"12135":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.2,"x":-10.59,"y":-34.65},{"time":0.8667,"x":-10.71,"y":89.24}]},"12136":{"translate":[{"x":-10.66,"y":33.49},{"time":0.3,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.6333,"x":-10.59,"y":-34.65},{"time":1,"x":-10.66,"y":33.49}]},"12137":{"translate":[{"x":-10.59,"y":-34.65},{"time":0.6667,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":1,"x":-10.59,"y":-34.65}]},"12138":{"translate":[{"x":-10.59,"y":-34.65},{"time":0.6667,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":1,"x":-10.59,"y":-34.65}]},"12139":{"translate":[{"x":-10.69,"y":64.46},{"time":0.1333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.4667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.69,"y":64.46}]},"圈圈":{"scale":[{"time":0.1667,"x":0.505,"y":0.505},{"time":0.7667,"x":1.367,"y":1.367}]},"连环马":{"translate":[{"x":2.92,"y":0.39,"curve":0.25,"c3":0.75},{"time":0.5,"x":2.91,"y":11.24,"curve":0.25,"c3":0.75},{"time":1,"x":2.92,"y":0.39}],"scale":[{"x":1.111,"y":1.111}]}}}}} \ No newline at end of file diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/绿装掉落/绿装掉落.json.meta b/assets/res/battleGameWeapon/spine/装备掉落效果/绿装掉落/绿装掉落.json.meta new file mode 100644 index 0000000..b43eaf4 --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/绿装掉落/绿装掉落.json.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.2.7", + "importer": "spine-data", + "imported": true, + "uuid": "0e4e8a50-2cf0-4df2-a2ac-ffc21bb9c0aa", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "atlasUuid": "d60f8853-0a69-48a5-8d49-a0dfa38a50b8" + } +} diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/绿装掉落/绿装掉落.png b/assets/res/battleGameWeapon/spine/装备掉落效果/绿装掉落/绿装掉落.png new file mode 100644 index 0000000..ac28dfa Binary files /dev/null and b/assets/res/battleGameWeapon/spine/装备掉落效果/绿装掉落/绿装掉落.png differ diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/绿装掉落/绿装掉落.png.meta b/assets/res/battleGameWeapon/spine/装备掉落效果/绿装掉落/绿装掉落.png.meta new file mode 100644 index 0000000..61b13d7 --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/绿装掉落/绿装掉落.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "beba3d44-1c4b-4b75-ba71-9320e73584db", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "beba3d44-1c4b-4b75-ba71-9320e73584db@6c48a", + "displayName": "绿装掉落", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "beba3d44-1c4b-4b75-ba71-9320e73584db", + "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": "beba3d44-1c4b-4b75-ba71-9320e73584db@f9941", + "displayName": "绿装掉落", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 534, + "height": 176, + "rawWidth": 534, + "rawHeight": 176, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -267, + -88, + 0, + 267, + -88, + 0, + -267, + 88, + 0, + 267, + 88, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 176, + 534, + 176, + 0, + 0, + 534, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -267, + -88, + 0 + ], + "maxPos": [ + 267, + 88, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "beba3d44-1c4b-4b75-ba71-9320e73584db@6c48a", + "atlasUuid": "", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "redirect": "beba3d44-1c4b-4b75-ba71-9320e73584db@6c48a" + } +} diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/蓝装掉落.meta b/assets/res/battleGameWeapon/spine/装备掉落效果/蓝装掉落.meta new file mode 100644 index 0000000..da33490 --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/蓝装掉落.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "b96cb076-c74b-4fea-9169-12047f6879fd", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/蓝装掉落/蓝装掉落.atlas b/assets/res/battleGameWeapon/spine/装备掉落效果/蓝装掉落/蓝装掉落.atlas new file mode 100644 index 0000000..97e6a9a --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/蓝装掉落/蓝装掉落.atlas @@ -0,0 +1,48 @@ + +蓝装掉落.png +size: 534,176 +format: RGBA8888 +filter: Linear,Linear +repeat: none +12131 + rotate: true + xy: 220, 0 + size: 12, 141 + orig: 12, 145 + offset: 0, 2 + index: -1 +图层 4 + rotate: true + xy: 0, 0 + size: 176, 218 + orig: 192, 243 + offset: 15, 2 + index: -1 +圈圈 + rotate: false + xy: 220, 14 + size: 158, 76 + orig: 158, 78 + offset: 0, 1 + index: -1 +效果1 + rotate: false + xy: 220, 92 + size: 185, 84 + orig: 205, 89 + offset: 11, 1 + index: -1 +效果2 + rotate: true + xy: 407, 53 + size: 123, 127 + orig: 138, 134 + offset: 8, 1 + index: -1 +连环马2 + rotate: true + xy: 380, 12 + size: 39, 81 + orig: 39, 81 + offset: 0, 0 + index: -1 diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/蓝装掉落/蓝装掉落.atlas.meta b/assets/res/battleGameWeapon/spine/装备掉落效果/蓝装掉落/蓝装掉落.atlas.meta new file mode 100644 index 0000000..3d2c8b5 --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/蓝装掉落/蓝装掉落.atlas.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.0.0", + "importer": "*", + "imported": true, + "uuid": "da93df40-c00e-41c8-84ff-ec8430b36093", + "files": [ + ".atlas", + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/蓝装掉落/蓝装掉落.json b/assets/res/battleGameWeapon/spine/装备掉落效果/蓝装掉落/蓝装掉落.json new file mode 100644 index 0000000..1957b7d --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/蓝装掉落/蓝装掉落.json @@ -0,0 +1 @@ +{"skeleton":{"hash":"L8iWGJz66w9Eejqgud9uIL6raYk","spine":"3.8.75","x":-106.41,"y":-51.96,"width":205.99,"height":205.38},"bones":[{"name":"root"},{"name":"bone","parent":"root","length":27.92,"rotation":-1.16,"x":-2.82,"y":-5.25},{"name":"装备掉落效果","parent":"bone","length":33.24,"rotation":-89.5,"x":-0.72,"y":-0.91},{"name":"效果1","parent":"root","length":43.31,"rotation":2.47,"x":-0.78,"y":-21.73,"scaleY":1.2349},{"name":"效果2","parent":"root","length":66.03,"rotation":-179.03,"x":-2.17,"y":-17.22,"scaleY":1.3645},{"name":"装备掉落效果2","parent":"bone","length":33.24,"rotation":-89.5,"x":-0.72,"y":-0.91},{"name":"12131","parent":"root","length":16.43,"rotation":178.88,"x":-45.15,"y":29.4},{"name":"12132","parent":"root","length":16.43,"rotation":178.88,"x":16.56,"y":55.39,"scaleX":0.8368,"scaleY":0.8368},{"name":"12133","parent":"root","length":16.43,"rotation":178.88,"x":32.8,"y":16.41,"scaleX":1.0487,"scaleY":1.0487},{"name":"12134","parent":"root","length":16.43,"rotation":178.88,"x":-15.45,"y":45.64,"scaleX":1.0487,"scaleY":1.0487},{"name":"12135","parent":"root","length":16.43,"rotation":178.88,"x":-58.7,"y":29.4,"scaleX":0.6258,"scaleY":0.6258},{"name":"12136","parent":"root","length":16.43,"rotation":178.88,"x":65.28,"y":30.33,"scaleX":0.6258,"scaleY":0.6258},{"name":"12137","parent":"root","length":16.43,"rotation":178.88,"x":1.71,"y":29.4,"scaleX":0.6258,"scaleY":0.6258},{"name":"12138","parent":"root","length":16.43,"rotation":178.88,"x":-23.34,"y":-4.47,"scaleX":0.6258,"scaleY":0.6258},{"name":"12139","parent":"root","length":16.43,"rotation":178.88,"x":49.97,"y":39.61,"scaleX":0.6258,"scaleY":0.6258},{"name":"圈圈","parent":"root","length":23.5,"rotation":-90,"x":-0.77,"y":-16.55},{"name":"连环马","parent":"root","length":30.29,"rotation":-144.37,"x":3.54,"y":16.3,"scaleX":1.0662,"scaleY":1.0662}],"slots":[{"name":"圈圈","bone":"圈圈","attachment":"圈圈"},{"name":"装备掉落效果","bone":"装备掉落效果"},{"name":"装备掉落效果2","bone":"装备掉落效果2"},{"name":"效果1","bone":"效果1","attachment":"效果1"},{"name":"效果2","bone":"效果2","attachment":"效果2"},{"name":"12131","bone":"12131","attachment":"12131"},{"name":"12132","bone":"12132","attachment":"12131"},{"name":"12133","bone":"12133","attachment":"12131"},{"name":"12134","bone":"12134","attachment":"12131"},{"name":"12135","bone":"12135","attachment":"12131"},{"name":"12136","bone":"12136","attachment":"12131"},{"name":"12137","bone":"12137","attachment":"12131"},{"name":"12138","bone":"12138","attachment":"12131"},{"name":"12139","bone":"12139","attachment":"12131"},{"name":"连环马","bone":"连环马","attachment":"连环马2"}],"skins":[{"name":"default","attachments":{"圈圈":{"圈圈":{"x":-5.13,"y":-0.61,"rotation":-91.12,"width":158,"height":78}},"装备掉落效果":{"图层 4":{"x":-66.73,"y":6.8,"rotation":90.66,"width":192,"height":243}},"12131":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12132":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12133":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12134":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12135":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12136":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12137":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12138":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"12139":{"12131":{"x":-0.33,"y":-1.17,"scaleX":0.698,"scaleY":0.3875,"rotation":2.09,"width":12,"height":145}},"效果1":{"效果1":{"x":-0.63,"y":37.79,"rotation":-2.47,"width":205,"height":89}},"效果2":{"效果2":{"x":1.58,"y":-57.78,"rotation":179.03,"width":138,"height":134}},"装备掉落效果2":{"图层 4":{"x":-66.73,"y":6.8,"rotation":90.66,"width":192,"height":243}},"连环马":{"连环马2":{"x":6.73,"y":-4.9,"rotation":-180,"width":39,"height":81}}}}],"animations":{"animation":{"slots":{"12131":{"color":[{"time":0.2333,"color":"ffffffff"},{"time":0.4333,"color":"ffffff00","curve":"stepped"},{"time":0.7667,"color":"ffffff00"},{"time":1,"color":"ffffffff"}]},"12135":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.2,"color":"ffffff00"},{"time":0.4333,"color":"ffffffff","curve":"stepped"},{"time":0.6667,"color":"ffffffff"},{"time":0.8667,"color":"ffffff00"}]},"装备掉落效果2":{"color":[{"color":"ffffffdf"},{"time":0.0333,"color":"ffffffff"},{"time":0.2667,"color":"ffffff00"},{"time":0.5,"color":"ffffffdf","curve":"stepped"},{"time":0.5333,"color":"ffffffdf"},{"time":0.5667,"color":"ffffffff"},{"time":0.8,"color":"ffffff00"},{"time":1,"color":"ffffffdf"}],"attachment":[{"name":"图层 4"}]},"12134":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.1333,"color":"ffffff00"},{"time":0.3667,"color":"ffffffff","curve":"stepped"},{"time":0.6,"color":"ffffffff"},{"time":0.8,"color":"ffffff00"}]},"12138":{"color":[{"color":"ffffff00"},{"time":0.2333,"color":"ffffffff","curve":"stepped"},{"time":0.4667,"color":"ffffffff"},{"time":0.6667,"color":"ffffff00"}]},"连环马":{"attachment":[{"name":null}]},"12132":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.2667,"color":"ffffff00"},{"time":0.5,"color":"ffffffff","curve":"stepped"},{"time":0.7333,"color":"ffffffff"},{"time":0.9333,"color":"ffffff00"}]},"12133":{"color":[{"color":"ffffff91"},{"time":0.1,"color":"ffffffff","curve":"stepped"},{"time":0.3333,"color":"ffffffff"},{"time":0.5333,"color":"ffffff00","curve":"stepped"},{"time":0.8667,"color":"ffffff00"},{"time":1,"color":"ffffff91"}]},"装备掉落效果":{"color":[{"color":"ffffff00"},{"time":0.2667,"color":"ffffffff"},{"time":0.5,"color":"ffffff00","curve":"stepped"},{"time":0.5333,"color":"ffffff00"},{"time":0.8,"color":"ffffffff"},{"time":1,"color":"ffffff00"}],"attachment":[{"name":"图层 4"}]},"圈圈":{"color":[{"time":0.1667,"color":"ffffffff"},{"time":0.7667,"color":"ffffff00"}],"attachment":[{"name":null},{"time":0.1667,"name":"圈圈"}]},"12136":{"color":[{"time":0.1,"color":"ffffffff"},{"time":0.3,"color":"ffffff00","curve":"stepped"},{"time":0.6333,"color":"ffffff00"},{"time":0.8667,"color":"ffffffff"}]},"12139":{"color":[{"color":"ffffffaa"},{"time":0.1333,"color":"ffffff00","curve":"stepped"},{"time":0.4667,"color":"ffffff00"},{"time":0.7,"color":"ffffffff","curve":"stepped"},{"time":0.9333,"color":"ffffffff"},{"time":1,"color":"ffffffaa"}]},"12137":{"color":[{"color":"ffffff00"},{"time":0.2333,"color":"ffffffff","curve":"stepped"},{"time":0.4667,"color":"ffffffff"},{"time":0.6667,"color":"ffffff00"}]}},"bones":{"root":{"rotate":[{"angle":-0.05}]},"装备掉落效果":{"translate":[{},{"time":0.5,"x":-0.55,"y":6.84},{"time":0.5333},{"time":1,"x":-0.55,"y":6.84}],"scale":[{"x":0.685},{"time":0.5,"x":1.532},{"time":0.5333,"x":0.685},{"time":1,"x":1.532}]},"效果2":{"scale":[{},{"time":0.2667,"y":1.577},{"time":0.5},{"time":0.7667,"y":1.577},{"time":1}]},"效果1":{"scale":[{},{"time":0.2667,"x":1.361},{"time":0.5},{"time":0.7667,"x":1.361},{"time":1}]},"装备掉落效果2":{"translate":[{"x":-0.27,"y":3.42},{"time":0.2333,"x":-0.55,"y":6.84},{"time":0.2667},{"time":0.5,"x":-0.27,"y":3.42,"curve":"stepped"},{"time":0.5333,"x":-0.27,"y":3.42},{"time":0.7667,"x":-0.55,"y":6.84},{"time":0.8},{"time":1,"x":-0.27,"y":3.42}],"scale":[{"x":1.109},{"time":0.2333,"x":1.532},{"time":0.2667,"x":0.685},{"time":0.5,"x":1.109,"curve":"stepped"},{"time":0.5333,"x":1.109},{"time":0.7667,"x":1.532},{"time":0.8,"x":0.685},{"time":1,"x":1.109}]},"12131":{"translate":[{"x":-10.63,"y":8.71},{"time":0.4333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.7667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.63,"y":8.71}]},"12132":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.2667,"x":-10.59,"y":-34.65},{"time":0.9333,"x":-10.71,"y":89.24}]},"12133":{"translate":[{"x":-10.62,"y":-9.87},{"time":0.5333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.8667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.62,"y":-9.87}]},"12134":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.1333,"x":-10.59,"y":-34.65},{"time":0.8,"x":-10.71,"y":89.24}]},"12135":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.2,"x":-10.59,"y":-34.65},{"time":0.8667,"x":-10.71,"y":89.24}]},"12136":{"translate":[{"x":-10.66,"y":33.49},{"time":0.3,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.6333,"x":-10.59,"y":-34.65},{"time":1,"x":-10.66,"y":33.49}]},"12137":{"translate":[{"x":-10.59,"y":-34.65},{"time":0.6667,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":1,"x":-10.59,"y":-34.65}]},"12138":{"translate":[{"x":-10.59,"y":-34.65},{"time":0.6667,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":1,"x":-10.59,"y":-34.65}]},"12139":{"translate":[{"x":-10.69,"y":64.46},{"time":0.1333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.4667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.69,"y":64.46}]},"圈圈":{"scale":[{"time":0.1667,"x":0.505,"y":0.505},{"time":0.7667,"x":1.367,"y":1.367}]},"连环马":{"translate":[{"x":2.92,"y":0.39,"curve":0.25,"c3":0.75},{"time":0.5,"x":2.91,"y":11.24,"curve":0.25,"c3":0.75},{"time":1,"x":2.92,"y":0.39}],"scale":[{"x":1.111,"y":1.111}]}}},"效果预览":{"slots":{"12131":{"color":[{"time":0.2333,"color":"ffffffff"},{"time":0.4333,"color":"ffffff00","curve":"stepped"},{"time":0.7667,"color":"ffffff00"},{"time":1,"color":"ffffffff"}]},"12135":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.2,"color":"ffffff00"},{"time":0.4333,"color":"ffffffff","curve":"stepped"},{"time":0.6667,"color":"ffffffff"},{"time":0.8667,"color":"ffffff00"}]},"装备掉落效果2":{"color":[{"color":"ffffffdf"},{"time":0.0333,"color":"ffffffff"},{"time":0.2667,"color":"ffffff00"},{"time":0.5,"color":"ffffffdf","curve":"stepped"},{"time":0.5333,"color":"ffffffdf"},{"time":0.5667,"color":"ffffffff"},{"time":0.8,"color":"ffffff00"},{"time":1,"color":"ffffffdf"}],"attachment":[{"name":"图层 4"}]},"12134":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.1333,"color":"ffffff00"},{"time":0.3667,"color":"ffffffff","curve":"stepped"},{"time":0.6,"color":"ffffffff"},{"time":0.8,"color":"ffffff00"}]},"12138":{"color":[{"color":"ffffff00"},{"time":0.2333,"color":"ffffffff","curve":"stepped"},{"time":0.4667,"color":"ffffffff"},{"time":0.6667,"color":"ffffff00"}]},"12132":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.2667,"color":"ffffff00"},{"time":0.5,"color":"ffffffff","curve":"stepped"},{"time":0.7333,"color":"ffffffff"},{"time":0.9333,"color":"ffffff00"}]},"12133":{"color":[{"color":"ffffff91"},{"time":0.1,"color":"ffffffff","curve":"stepped"},{"time":0.3333,"color":"ffffffff"},{"time":0.5333,"color":"ffffff00","curve":"stepped"},{"time":0.8667,"color":"ffffff00"},{"time":1,"color":"ffffff91"}]},"装备掉落效果":{"color":[{"color":"ffffff00"},{"time":0.2667,"color":"ffffffff"},{"time":0.5,"color":"ffffff00","curve":"stepped"},{"time":0.5333,"color":"ffffff00"},{"time":0.8,"color":"ffffffff"},{"time":1,"color":"ffffff00"}],"attachment":[{"name":"图层 4"}]},"圈圈":{"color":[{"time":0.1667,"color":"ffffffff"},{"time":0.7667,"color":"ffffff00"}],"attachment":[{"name":null},{"time":0.1667,"name":"圈圈"}]},"12136":{"color":[{"time":0.1,"color":"ffffffff"},{"time":0.3,"color":"ffffff00","curve":"stepped"},{"time":0.6333,"color":"ffffff00"},{"time":0.8667,"color":"ffffffff"}]},"12139":{"color":[{"color":"ffffffaa"},{"time":0.1333,"color":"ffffff00","curve":"stepped"},{"time":0.4667,"color":"ffffff00"},{"time":0.7,"color":"ffffffff","curve":"stepped"},{"time":0.9333,"color":"ffffffff"},{"time":1,"color":"ffffffaa"}]},"12137":{"color":[{"color":"ffffff00"},{"time":0.2333,"color":"ffffffff","curve":"stepped"},{"time":0.4667,"color":"ffffffff"},{"time":0.6667,"color":"ffffff00"}]}},"bones":{"root":{"rotate":[{"angle":-0.05}]},"装备掉落效果":{"translate":[{},{"time":0.5,"x":-0.55,"y":6.84},{"time":0.5333},{"time":1,"x":-0.55,"y":6.84}],"scale":[{"x":0.685},{"time":0.5,"x":1.532},{"time":0.5333,"x":0.685},{"time":1,"x":1.532}]},"效果2":{"scale":[{},{"time":0.2667,"y":1.577},{"time":0.5},{"time":0.7667,"y":1.577},{"time":1}]},"效果1":{"scale":[{},{"time":0.2667,"x":1.361},{"time":0.5},{"time":0.7667,"x":1.361},{"time":1}]},"装备掉落效果2":{"translate":[{"x":-0.27,"y":3.42},{"time":0.2333,"x":-0.55,"y":6.84},{"time":0.2667},{"time":0.5,"x":-0.27,"y":3.42,"curve":"stepped"},{"time":0.5333,"x":-0.27,"y":3.42},{"time":0.7667,"x":-0.55,"y":6.84},{"time":0.8},{"time":1,"x":-0.27,"y":3.42}],"scale":[{"x":1.109},{"time":0.2333,"x":1.532},{"time":0.2667,"x":0.685},{"time":0.5,"x":1.109,"curve":"stepped"},{"time":0.5333,"x":1.109},{"time":0.7667,"x":1.532},{"time":0.8,"x":0.685},{"time":1,"x":1.109}]},"12131":{"translate":[{"x":-10.63,"y":8.71},{"time":0.4333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.7667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.63,"y":8.71}]},"12132":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.2667,"x":-10.59,"y":-34.65},{"time":0.9333,"x":-10.71,"y":89.24}]},"12133":{"translate":[{"x":-10.62,"y":-9.87},{"time":0.5333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.8667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.62,"y":-9.87}]},"12134":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.1333,"x":-10.59,"y":-34.65},{"time":0.8,"x":-10.71,"y":89.24}]},"12135":{"translate":[{"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.2,"x":-10.59,"y":-34.65},{"time":0.8667,"x":-10.71,"y":89.24}]},"12136":{"translate":[{"x":-10.66,"y":33.49},{"time":0.3,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.6333,"x":-10.59,"y":-34.65},{"time":1,"x":-10.66,"y":33.49}]},"12137":{"translate":[{"x":-10.59,"y":-34.65},{"time":0.6667,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":1,"x":-10.59,"y":-34.65}]},"12138":{"translate":[{"x":-10.59,"y":-34.65},{"time":0.6667,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":1,"x":-10.59,"y":-34.65}]},"12139":{"translate":[{"x":-10.69,"y":64.46},{"time":0.1333,"x":-10.71,"y":89.24,"curve":"stepped"},{"time":0.4667,"x":-10.59,"y":-34.65},{"time":1,"x":-10.69,"y":64.46}]},"圈圈":{"scale":[{"time":0.1667,"x":0.505,"y":0.505},{"time":0.7667,"x":1.367,"y":1.367}]},"连环马":{"translate":[{"x":2.92,"y":0.39,"curve":0.25,"c3":0.75},{"time":0.5,"x":2.91,"y":11.24,"curve":0.25,"c3":0.75},{"time":1,"x":2.92,"y":0.39}],"scale":[{"x":1.111,"y":1.111}]}}}}} \ No newline at end of file diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/蓝装掉落/蓝装掉落.json.meta b/assets/res/battleGameWeapon/spine/装备掉落效果/蓝装掉落/蓝装掉落.json.meta new file mode 100644 index 0000000..f46b632 --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/蓝装掉落/蓝装掉落.json.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.2.7", + "importer": "spine-data", + "imported": true, + "uuid": "6d3fd8fe-76cc-4020-93b5-37392f9cf374", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "atlasUuid": "da93df40-c00e-41c8-84ff-ec8430b36093" + } +} diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/蓝装掉落/蓝装掉落.png b/assets/res/battleGameWeapon/spine/装备掉落效果/蓝装掉落/蓝装掉落.png new file mode 100644 index 0000000..53c3aab Binary files /dev/null and b/assets/res/battleGameWeapon/spine/装备掉落效果/蓝装掉落/蓝装掉落.png differ diff --git a/assets/res/battleGameWeapon/spine/装备掉落效果/蓝装掉落/蓝装掉落.png.meta b/assets/res/battleGameWeapon/spine/装备掉落效果/蓝装掉落/蓝装掉落.png.meta new file mode 100644 index 0000000..4fb65eb --- /dev/null +++ b/assets/res/battleGameWeapon/spine/装备掉落效果/蓝装掉落/蓝装掉落.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "538bf7ba-1a0b-4e9b-9225-b1df1038a971", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "538bf7ba-1a0b-4e9b-9225-b1df1038a971@6c48a", + "displayName": "蓝装掉落", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "538bf7ba-1a0b-4e9b-9225-b1df1038a971", + "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": "538bf7ba-1a0b-4e9b-9225-b1df1038a971@f9941", + "displayName": "蓝装掉落", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 534, + "height": 176, + "rawWidth": 534, + "rawHeight": 176, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -267, + -88, + 0, + 267, + -88, + 0, + -267, + 88, + 0, + 267, + 88, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 176, + 534, + 176, + 0, + 0, + 534, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -267, + -88, + 0 + ], + "maxPos": [ + 267, + 88, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "538bf7ba-1a0b-4e9b-9225-b1df1038a971@6c48a", + "atlasUuid": "", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "redirect": "538bf7ba-1a0b-4e9b-9225-b1df1038a971@6c48a" + } +} diff --git a/assets/res/font/str.txt b/assets/res/font/str.txt index b2f1bd0..20a92b1 100644 --- a/assets/res/font/str.txt +++ b/assets/res/font/str.txt @@ -1,2 +1,2 @@ [ - {"_type:c.Prfab,nmgGidojFls0Ex}v1zNuh2846]3V-5Qw背包格开启7UITSC9KRqAMB@JHYOD+未LWk文字选项框X/待Z怪物来袭第波一倍速二资产底部出砚台召唤金币视频标图点石成自动合置灰线<=>敌方信息引导手指上箭头加宝箱秒杀斩受击刀痕光效特果禁止跳拖尾暴子锁定死亡营地血条量长保护派机兵走路吹号角猴虾魂小土木水火发阴影冰冻锥结恶鬼下层攻晕眩流电粘液盾睡觉鼻涕泡呼噜限万神幡三味真持续九霄雷乾坤袋桃率卡千里眼封榜授仙箓属性幻镜施法技能弱危提示升级昌笔碎帝钟偷缚网捕获门向左退齐落飞行弹冲锋枪剑气阵目皮肤束哮天犬杨戬刺身术悟空放复活干扰迷雾挑砸损毁风雪李靖塔棍红治疗混乱生簿母大招普通疾直龙矢葫芦画追踪射体降雨原旋转车缨武器景系静态障碍片口盖在面宫河桥府岩浆花山编辑时到中查看状蓝虚紫色橙闪#让我们替换它确取消存清除设等战斗和关闭汽炸窗题力灾厄盒现几翻，数或符所有%赏令后概多得个增的*幸运掉鏖册对丸π双寻尺解块额外御珠接近灭省契耗滞牌进度矿每枚随变北京津西内蒙古辽宁吉林黑江海苏浙安徽福建东南湖广重庆四川贵州云藏陕甘肃青夏新疆湾香港澳初始最值恢间（单位：）刷盘道具告购买权次隔首匹配段少星于局铲达离终触展推使用日胜场奖励应当前为整超过不玩家游戏公容好！正式见了欢迎验程任何问反馈。期就是组算钱飘免费基础绿两默认巡妖白骨精女·阶唐僧嫦娥哪吒尖孙如意箍棒猪八戒玉轩辕儿国王太乙爆伤狠分裂燃烧幅|幼园班学年五六高硕士博讲师教劈砍扇形连带抡圈携扩范围球抛散穿透戳添横扫并释倒群树友军移非猛踩将周镇瞬无作造害交错丢挥舞需要循环表专根据区域减参考人族命距扔但占输独立调装档帮助快捷入美割仓库返回页桌赠送钻礼商店已领券充月词及副本荡可张马激卸载彩虹功章节即累计失败还没仅观请先完品今登录制误异常检剧情够摧抽足吧径堵!经补余剩备困难模狱明再满其他该兑码铜灵英雄斧弓沙阎吸尘酷炫猎以与素材搭质全收益必把锐比极投掷贯弯远处卷残般杖钉耙显握审判众操纵寒签铁银黄铂耀宗者稀享尽叫森漠优摆()蜘蛛禽漩涡狐狸巫注会响知刮起狂给魅惑你临继工版更轮择、敬戴七十折拥荐饿…吃桀别怕温柔滚菜食类末逃撕延闯易统短冷却兽语靠强往暂停弃只差至虽然也音乐震侧边栏都甲城挂越打积务列否？己丰厚预览世站传说堆唯丧尸言简宠邀培养钥匙馨感着低℃浓逐渐覆抵抗昼夜许些修此筑?排名魔描述农牢笼劳男刻利支援榴莲理且主屏幕右滑牛哦恭喜您去哈奇螃蟹乌龟梅鹿狗焰狮猫熊鹰烈羊驼押雇佣闹帘蓬凡拘伸腾而之断急漫针齿池链吞噬递君巨归心百掌叶圣同牙留住啃化半逻父深协瑶赐共庭娘霆轰顶掣切缉拿承祝从脚梭×&征唔溜痛种尚镶嵌醒永久鉴步私货噻称售罄被惊圆矩拷贝糕客料喽爱繁한국어にほんごñçрускийязыí像论遮罩戟件';曲代控坐境构求夹^\$~`🚫➡️报允缓密例压缩适缺寸居钩监听事颜；则忽略宽相拐平采样绘帧端议～总避遍历固旧截那实沿播竖管记板索克隆擦案轴储维供渲染各函须致若按改含象垂倾斜填跟偏附惯执型拟布＜殊裁剪毕这写某义印序因元约负摸抬肯准做创话删竟驱粗怼防哎呢候才想善啊艹坑👈👉罕况套志识钮依赖销证界粒擎核阻纹─缘浮跃衰→老烟傻撒奥斯刚尝试集源串废址拉隐摘仍读跑缀早跨逆赋访插联键邻顺骤弦↔谁煮肉饭找滤均洗拽很突声锚欧析策价拓扑纯测热氏钳署照由航途朝业规轻「」溯旁曼顿估假塞校恰桶赶拦服聚迟抑硬绑卖荷挡扣绪兜栈勿队零—另互槽询丹稍叠爪囚际污芭蕉乘划汇墙毫竞碰撞拍漏脱威胁蟠≤°筛贪济扁决垮史莱姆厂典宿责订阅迭螺漂爬匀涉兼昧腰亦批举架抖微份职演绕络户探厅偿≥便绎聊智警慢佳译¥₩﷼坏句棋挖–仿抢棵拆拒绝骰饰撤疫妙恒遗挪斥答“亮”晋闩闲驻磁峰拼泵贴壳曾纠脏剔诊Σ伪较欠挤姿淡旦孤委托辨律踢丁露故幂晚稳员鸿付脑裸亿兆垓秭穰沟涧阿祇思什么似科季尔弧耦浏虑 【】诗椭抓暗珊瑚座墨朵耳隙丞奔灞帅猩猿魈浪臂鱼鸟喷谛玲珑扭书骼宵摊婆饼霜诛芒舌菩昭晶财灯破糊§©®™←↑↓●■◆▲▼★☆○《》『』〈〉‘’￥£¢∞℉钢镔毒刃莫邪吴敖玄罗笑赢挣宅掘麾振鼓沉村匠铺枝柳凑净搬孩岂肆犯脉畏惧碧侵溃捍卫幽冥踏讨伐泉奈忘彻旗扬鸣辈秩严辱崩蓄驭驰祭颗伙蔓践陷吼猜藤叹伞烁缝臭草袈裟禅救帽嘴泪啦鹅姐奶荧溅巴筒赫柱摔炮雹甜窜陀昨款掰野练习削罢捡趁棉昊田既险紧账冤募鼋犀腿掏粪熔炉涂僵焊研洞拳皇丑潮冠珍淇淋鼍虎贼鼠蛮豕卒鳝貉貂豹鲤鳌蜃戾煞魄伥蟾蚌蛇螭守魇怨祟夔犼欲蝎魉魍魑魃猊狼獐獾猢獬蚣盗凶蛊嗔痴胖锤鬃毛颚祥育抱富爷呆妇拾荒壮髦病丝糖贸市堂翅篮摇俑厨烤夫吐虫猕劫涌鹏宴刘洪寅岭峦佛祖寇潜渊焚罴傲猁兔丈鳞蟒梁凰妄赛岁辟尊眉袍膀俯隼弄洛阳陨仇捞粮滋杆催铃勾详坊荆撑睛街陋搜厉努医船锅胳膊梯阱楼希望攀松阈悬瞄崖鸡哥蝉兹蔽遭贬胎亲逢叉陡渡庄捎銮殿摄赌祛兴遇伏婚琵琶苦棘吟咏诸柿衕秽朱拯疲癃脸＞油 奏竹蜻蜓罚最叆（¤šº¾è¡¨‰˜­¯ªé»Œä¸Žž½±‹³‡‚¹Ÿ„Šƒã•µ²¿¦›«´¬�纳¶借肩摩裙室烂药洁骑磨稻拇彪院氛蜂窝睁汤缸苗骷髅粉呜又究怎丘房卧凤郡钯捉竺凌遥席噼啪脆捆办央馆谷社郊民隧宾炼溶峡坝碑坟煤酒葬寺庙坍塌艺舍蔬棚钓洲豪华邮赴糟谢训勤吗穷怀疑她迹嗯垃圾肥米杂锻拣冶堡细软锯廓颠尬泄司咪簇匕溢灼沫镖秘坚椅炒床煎娃械茶筝票雕塑凉亭乒乓柜筋桩墩篓纸枯凳韩伯✅🌍菱橘蛙∈映盆栽砖躺毯闸吊泥坛厢舰琴瓷咨筐茅屋岗弥勒饵灶植恐蛋裹墓棺烛罐帐篷介绍赚衣嫌喇叭梦媚玻璃傅咸绳赎罪慌汗坠忆担挽念蒸弗兰伦裤梨斑斓啥晓闻囤顾宣柴秀滩腐蚀畜淬晃喝爽噩团曝砧壁沾瘦矮陆帆鞋察筷哇桂鸭媒咖啡麻辣蜜盛聘企洽谈佬诚彼悔恨逼妹骗惨亏篑捧爸俊杰董宏伟碗瓶膏纫秋扳醋翡翠檀唱仪偶洋饮鲜簪杯镯谱剂抹轿芯壶党胶冬苁蓉枸杞茸漱皂苷杉醇凝奢健宋酿啤斛燕午餐麦脂豆芝墅麝胆杏铸膜蚕瑞沈舟珩楚慕萧婉疏秦阮禾辞官溪陈沐桐翊辰赵予郑冯眠沅曦邓曹宇泽峻熙嘉铭彦郭春棠芽雀柚瓮琛郁柠徐叙舒胡袁吕卢蒋蔡贾魏薛潘杜澄奕尧弈敢嚣扛搞霞蹭斤兄弟饶痒喉咙捏饥渴耐喊滥谨慎阀崛争霸淘违迫扶融埃碾瓜汪康娱叮蚁休迪驾驶讯宙酱蚂堪钞暖拜泰窦诉郎砒焖肝晦贱股陪俩谋祸眨誓妈瘫艾吓贷懂轨敲呀踹姓债骂篡忙扯淑芬郝丫惹歹屈胸哼撩耍嘛羞嘿祈奋耻聪挺欺叔尴茬良奸谍殴崽葱嘞麒麟赔瞧肾蚝咱辆佩势荣苛抚咬劝泼烦屁挨揍跪孕嗨愿卑鄙厕掐脖稽扎仔甩忍刹砰嫂妮拱磕逞醉薇胞恩槌袒宜耽撬丽莎暧愉渣骆蹲昂朴贿赂瞎廊妻夺嫩卓祎悄浑捣租掩啰衡遣辛盯趴凭蹋辅劲窃纪涨趋氓馁恼犒磊噪舵筹瞒趟德缠患裕舅涩菲揽矛谅趣朋寨懒促恙憋咎懈怠犊谓呗唧届躲勇拭夸鞠躬瘁癖傍巧芸叛囊蠢舆熟酵织搅搁措诺眈颈幺蛾薪妨跌犹豫乞丐俱嘲掺撼逛忧怒奠伍枉惜昏寄冒雅觑喘呈瓢吵娜惠峥嵘耕塘芳桑柄槛盈衔渍嘟愤浴巾咔肘咚暑衅膝皱馒咀嚼撇盔铠莉搂捂袱盹讶肿龇杠鸦肚嘻挠旅侦呲羽掸酥掳椒玫瑰滕巅浩孟夕疼悉缮窍拎裆靡萌辉煌倡廉擘亨寡滨劣掀萨噶歌伴革殖侄腻愁姨诽谤甚仁悦栋诅咒缴瘟屎诬诱谣灌澡嫣蟑螂猖呦逾潇洒诈妥碳唉湘刁爹辜庞嫁贤牺牲垄愧乖逮惺怜乎嘱咐貌恳疯伎霉兮崴踝绷妞蕾勉瞌仆苍坯贫漆笨纽遵驳悠酸揉捶伺哭嘎绩晨赞愣渠屉肺昆仑炎ÄÖÜöüßàùêâîôûаАЯЁёìÍÌÁÀáÉÈÒÓòóŐőÙÚŰúűÑÆÃÂÔõěčřýůťďňĚČŘŤżźśńłę湯ŹŚŃŁĘĆĄảạăắằẳẵặấầẩẫậẻẽẹếềểễệỉĩịỏọốồổỗộơớờởỡợủũụưứừửữựỳỷỹỵđẢẠĂẮẰẲẴẶẤẦẨẪẬẺẼẸÊẾỀỂỄỆỈĨỊỎÕỌỐỒỔỖỘƠỚỜỞỠỢỦŨỤƯỨỪỬỮỰÝỲỶỸỴĐ😉🚗哟噢井玛喂弊括祗仕戈盲≈沼披畅÷敏蝇酣漓昵汉鞭θ怖咩评锹苹飙⚠❌👇⚡🔄💡級镂穴窄矫①②惩逗迁综惰滴尤侣拧∩−仰皆褐③④挫盟枭埋羁绊岛≠瓣膨胀泛俸禄政吾擂徒・庐揭薄篇≫哨佐瞻蹦Δ浅凸掠垫拢擅匿碌剥申 \ No newline at end of file + {"_type:c.Prfab,nmgGidojFls0Ex}v1zNuh2846]3V-5Qw背包格开启7UITSC9KRqAMB@JHYOD+未LWk文字选项框X/待Z怪物来袭第波一倍速二资产底部出砚台金币视频标图点石成自动合置灰线<=>敌方信息引导手指上箭头加宝箱秒杀斩受击刀痕光效特木水火土皮肤禁止跳拖尾暴子锁定死亡营地血条量长保护派机兵走路吹号角猴虾魂小发阴影冰冻锥结恶鬼下层攻晕眩流电粘液果盾睡觉鼻涕泡呼噜限万神幡三味真持续九霄雷乾坤袋桃率卡千里眼双符属性四封榜授仙箓幻镜施法技能弱危提示升级昌笔碎帝钟偷缚网捕获衰门向左退随牌齐落飞行弹冲锋枪剑气阵目束召唤哮天犬杨戬刺身术悟空放复活干扰迷雾挑砸损毁风雪李靖塔棍红治疗混乱生簿母大招普通疾直龙矢葫芦画追踪射体降雨原旋转车缨掉品质武器景戈墟静态障碍片口盖在面灵渊遮澜沧离岳冈宫河桥府岩浆花山编辑时到中查看状蓝虚紫色橙闪#让我们替换它确取消存清除设等战斗和关闭汽炸窗题力几，数或所有%赏令后概多得个增的*幸运鏖册对丸π寻尺解块额外御珠接近灭省契耗滞进度矿每枚变伤害Ⅰ系爆ⅡⅢ距远最释程超过低于幅|毒素命给添造群周围友军必狠舞穿透球次区域减并脚潭经打单位强化分裂霸王之场支云巨燃隔牛扇形精准同极输北京津西内蒙古辽宁吉林黑江海苏浙安徽福建东南湖广重庆川贵州藏陕甘肃青夏新疆湾香港澳初始值恢间（：）刷盘道具告购买权首匹配段少星局铲现达终触展推使用日胜奖励应当前为整不玩家游戏公容好！正式见了欢迎验任何问反馈。期就是组算钱飘免费基础绿默认巡妖白骨女·阶唐僧嫦娥哪吒尖两孙如意箍棒猪八戒玉轩辕儿国太乙烧幼园班学年五六高硕士博讲师教劈砍连带抡圈携扩范抛散戳横扫倒树移非猛踩将镇瞬无作交错丢挥需要循环表专根据参考人族扔但占独立调装档帮助快捷入美返回页桌赠送钻礼商店已领券充月词及副本荡可张马激卸载彩虹功章节即累计失败还没仅观请先完今登录制误异常检剧情够摧抽足吧径堵!补余剩备困难模狱明再满其他该兑码铜英雄斧弓沙阎吸尘酷炫猎以与材搭全收益把锐比投掷贯弯处卷残般杖钉耙显握审判众操纵寒签铁银黄铂耀宗者稀享尽叫森漠优摆()蜘蛛禽漩涡狐狸巫注会响知刮起狂魅惑你临继工版更轮择、敬戴七十折拥荐饿…吃桀别怕温柔滚菜食类末逃撕延闯易统短冷却兽语靠往暂停弃只差至虽然也音乐震侧边栏都甲城挂越积务列否？己丰厚预览世站传说堆唯丧尸言简宠邀培养钥匙馨感着℃浓逐渐覆抵抗昼夜许些修此筑?排名魔描述农牢笼劳男刻利援榴莲理且主屏幕右滑哦恭喜您去哈奇螃蟹乌龟梅鹿狗焰狮猫熊鹰烈羊驼押雇佣闹帘蓬凡拘伸腾而断急漫针齿池链吞噬递君归心百掌叶圣牙留住啃半逻父深翻协瑶赐共庭娘霆轰顶掣切割缉拿承祝从梭×&征唔溜痛种尚镶嵌醒永久鉴库步私货噻称售罄被惊圆矩拷贝糕客料喽爱繁한국어にほんごñçрускийязыí像罩戟件';曲代控坐境构求夹^\$~`🚫➡️报允缓密例压缩适缺寸居钩监听事颜；则忽略宽相拐平采样绘帧端议～总避遍历固旧截那实沿播竖管记板索克隆擦案轴储维供渲染各函须致若按改含象垂倾斜填跟偏附惯执型拟布＜殊裁剪毕这写某义印序因元约负摸抬肯做创话删竟驱粗怼防哎呢候才想善啊艹坑👈👉罕况套志识钮依赖销证界粒擎核阻纹─缘浮跃→老烟傻撒奥斯刚尝试集源串废址拉隐摘仍读跑缀早跨逆赋访插联键邻顺骤弦↔谁煮肉饭找滤均洗拽很突声锚欧析策价拓扑纯测热氏钳署照由航途朝业规轻「」溯旁曼顿估假塞校恰桶赶拦服聚迟抑硬绑卖荷挡扣绪兜栈勿队零—另互槽询丹稍叠爪囚际污乘芭蕉贡献划汇墙毫竞碰撞拍漏盒脱威胁蟠剔筛≤°贪济扁决垮史莱姆厂典宿责订阅迭螺漂爬匀涉兼昧腰亦批举架抖微份职演绕络户探厅偿≥便绎聊智警慢佳贴幂拼±绝壳›险铺拔刘译¥₩﷼坏句棋挖–仿抢棵拆拒骰饰撤疫妙恒遗挪斥答“亮”晋闩闲驻磁峰泵曾纠脏诊Σ伪较欠挤姿淡旦孤委托辨律踢丁露故晚稳员鸿付脑裸亿兆垓秭穰沟涧阿祇思什么论似科季尔弧耦浏虑 【】诗椭抓暗珊瑚座墨朵耳隙丞奔灞帅猩猿魈浪臂鱼鸟喷谛玲珑扭书骼宵摊婆饼霜诛芒舌菩昭晶财灯破糊§©®™←↑↓●■◆▲▼★☆○《》『』〈〉‘’￥£¢∞℉灾厄仓钢镔刃莫邪吴敖玄罗笑赢挣宅掘麾振鼓沉村匠枝柳凑净搬孩岂肆犯脉畏惧碧侵溃捍卫幽冥踏讨伐泉奈忘彻旗扬鸣辈秩严辱崩蓄驭驰祭颗伙蔓践陷吼猜藤叹伞烁缝臭草袈裟禅救帽嘴泪啦鹅姐奶荧溅巴筒赫柱摔炮雹甜窜陀昨款掰野练习削罢捡趁棉昊田既紧账冤募鼋犀腿掏粪熔炉涂僵焊研洞拳皇丑潮冠珍淇淋鼍虎贼鼠蛮豕卒鳝貉貂豹鲤鳌蜃戾煞魄伥蟾蚌蛇螭守魇怨祟夔犼欲蝎魉魍魑魃猊狼獐獾猢獬蚣盗凶蛊嗔痴胖锤鬃毛颚祥育抱富爷呆妇拾荒壮髦病丝糖贸市堂翅篮摇俑厨烤夫吐虫猕劫涌鹏宴洪寅岭峦佛祖寇潜焚罴傲猁兔丈鳞蟒梁凰妄赛岁辟尊眉袍膀俯隼弄洛阳陨仇捞粮滋杆催铃勾详坊荆撑睛街陋搜厉努医船锅胳膊梯阱楼希望攀松阈悬瞄崖鸡哥蝉兹蔽遭贬胎亲逢叉陡渡庄捎銮殿摄赌祛兴遇伏婚琵琶苦棘吟咏诸柿衕秽朱拯疲癃脸＞油 奏竹蜻蜓罚最叆（¤šº¾è¡¨‰˜­¯ªé»Œä¸Žž½‹³‡‚¹Ÿ„Šƒã•µ²¿¦«´¬�纳¶借肩摩裙室烂药洁骑磨稻拇彪院氛蜂窝睁汤缸苗骷髅粉呜又究怎丘房卧凤郡钯捉竺凌遥席噼啪脆捆办央馆谷社郊民隧宾炼溶峡坝碑坟煤酒葬寺庙坍塌艺舍蔬棚钓洲豪华邮赴糟谢训勤吗穷怀疑她迹嗯垃圾肥米杂锻拣冶堡细软锯廓颠尬泄司咪簇匕溢灼沫镖秘坚椅炒床煎娃械茶筝票雕塑凉亭乒乓柜筋桩墩篓纸枯凳韩伯✅🌍菱橘蛙∈映盆栽砖躺毯闸吊泥坛厢舰琴瓷咨筐茅屋岗弥勒饵灶植恐蛋裹墓棺烛罐帐篷介绍赚衣嫌喇叭梦媚玻璃傅咸绳赎罪慌汗坠忆担挽念蒸弗兰伦裤梨斑斓啥晓闻囤顾宣柴秀滩腐蚀畜淬晃喝爽噩团曝砧壁沾瘦矮陆帆鞋察筷哇桂鸭媒咖啡麻辣蜜盛聘企洽谈佬诚彼悔恨逼妹骗惨亏篑捧爸俊杰董宏伟碗瓶膏纫秋扳醋翡翠檀唱仪偶洋饮鲜簪杯镯谱剂抹轿芯壶党胶冬苁蓉枸杞茸漱皂苷杉醇凝奢健宋酿啤斛燕午餐麦脂豆芝墅麝胆杏铸膜蚕瑞沈舟珩楚慕萧婉疏秦阮禾辞官溪陈沐桐翊辰赵予郑冯眠沅曦邓曹宇泽峻熙嘉铭彦郭春棠芽雀柚瓮琛郁柠徐叙舒胡袁吕卢蒋蔡贾魏薛潘杜澄奕尧弈敢嚣扛搞霞蹭斤兄弟饶痒喉咙捏饥渴耐喊滥谨慎阀崛争淘违迫扶融埃碾瓜汪康娱叮蚁休迪驾驶讯宙酱蚂堪钞暖拜泰窦诉郎砒焖肝晦贱股陪俩谋祸眨誓妈瘫艾吓贷懂轨敲呀踹姓债骂篡忙扯淑芬郝丫惹歹屈胸哼撩耍嘛羞嘿祈奋耻聪挺欺叔尴茬良奸谍殴崽葱嘞麒麟赔瞧肾蚝咱辆佩势荣苛抚咬劝泼烦屁挨揍跪孕嗨愿卑鄙厕掐脖稽扎仔甩忍刹砰嫂妮拱磕逞醉薇胞恩槌袒宜耽撬丽莎暧愉渣骆蹲昂朴贿赂瞎廊妻夺嫩卓祎悄浑捣租掩啰衡遣辛盯趴凭蹋辅劲窃纪涨趋氓馁恼犒磊噪舵筹瞒趟德缠患裕舅涩菲揽矛谅趣朋寨懒促恙憋咎懈怠犊谓呗唧届躲勇拭夸鞠躬瘁癖傍巧芸叛囊蠢舆熟酵织搅搁措诺眈颈幺蛾薪妨跌犹豫乞丐俱嘲掺撼逛忧怒奠伍枉惜昏寄冒雅觑喘呈瓢吵娜惠峥嵘耕塘芳桑柄槛盈衔渍嘟愤浴巾咔肘咚暑衅膝皱馒咀嚼撇盔铠莉搂捂袱盹讶肿龇杠鸦肚嘻挠旅侦呲羽掸酥掳椒玫瑰滕巅浩孟夕疼悉缮窍拎裆靡萌辉煌倡廉擘亨寡滨劣掀萨噶歌伴革殖侄腻愁姨诽谤甚仁悦栋诅咒缴瘟屎诬诱谣灌澡嫣蟑螂猖呦逾潇洒诈妥碳唉湘刁爹辜庞嫁贤牺牲垄愧乖逮惺怜乎嘱咐貌恳疯伎霉兮崴踝绷妞蕾勉瞌仆苍坯贫漆笨纽遵驳悠酸揉捶伺哭嘎绩晨赞愣渠屉肺昆仑炎ÄÖÜöüßàùêâîôûаАЯЁёìÍÌÁÀáÉÈÒÓòóŐőÙÚŰúűÑÆÃÂÔõěčřýůťďňĚČŘŤżźśńłę湯ŹŚŃŁĘĆĄảạăắằẳẵặấầẩẫậẻẽẹếềểễệỉĩịỏọốồổỗộơớờởỡợủũụưứừửữựỳỷỹỵđẢẠĂẮẰẲẴẶẤẦẨẪẬẺẼẸÊẾỀỂỄỆỈĨỊỎÕỌỐỒỔỖỘƠỚỜỞỠỢỦŨỤƯỨỪỬỮỰÝỲỶỸỴĐ😉🚗哟噢井玛喂弊括祗仕盲≈沼披畅÷敏蝇酣漓昵汉鞭θ怖咩评锹苹飙⚠❌👇⚡🔄💡級镂穴窄矫①②惩逗迁综惰滴尤侣拧∩−仰皆褐③④挫盟枭埋羁绊岛≠瓣膨胀泛俸禄政吾擂徒・庐揭薄篇≫哨佐瞻蹦Δ浅凸掠垫拢擅匿碌剥申寂寞 \ No newline at end of file diff --git a/assets/res/gemstone/texture/框-大-3.png b/assets/res/gemstone/texture/三角形 2042.png similarity index 52% rename from assets/res/gemstone/texture/框-大-3.png rename to assets/res/gemstone/texture/三角形 2042.png index 95049ab..efc9917 100644 Binary files a/assets/res/gemstone/texture/框-大-3.png and b/assets/res/gemstone/texture/三角形 2042.png differ diff --git a/assets/res/gemstone/texture/框-大.png.meta b/assets/res/gemstone/texture/三角形 2042.png.meta similarity index 70% rename from assets/res/gemstone/texture/框-大.png.meta rename to assets/res/gemstone/texture/三角形 2042.png.meta index 68438f5..80049e7 100644 --- a/assets/res/gemstone/texture/框-大.png.meta +++ b/assets/res/gemstone/texture/三角形 2042.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "818e77e0-06c7-49da-8bd4-8309c55f5760", + "uuid": "d5a2367a-5e87-44d0-95ef-557fae49c3f5", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "818e77e0-06c7-49da-8bd4-8309c55f5760@6c48a", - "displayName": "框-大", + "uuid": "d5a2367a-5e87-44d0-95ef-557fae49c3f5@6c48a", + "displayName": "三角形 2042", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "818e77e0-06c7-49da-8bd4-8309c55f5760", + "imageUuidOrDatabaseUri": "d5a2367a-5e87-44d0-95ef-557fae49c3f5", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "818e77e0-06c7-49da-8bd4-8309c55f5760@f9941", - "displayName": "框-大", + "uuid": "d5a2367a-5e87-44d0-95ef-557fae49c3f5@f9941", + "displayName": "三角形 2042", "id": "f9941", "name": "spriteFrame", "userData": { @@ -45,10 +45,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 100, - "height": 101, - "rawWidth": 100, - "rawHeight": 101, + "width": 46, + "height": 70, + "rawWidth": 46, + "rawHeight": 70, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -50, - -50.5, + -23, + -35, 0, - 50, - -50.5, + 23, + -35, 0, - -50, - 50.5, + -23, + 35, 0, - 50, - 50.5, + 23, + 35, 0 ], "indexes": [ @@ -83,12 +83,12 @@ ], "uv": [ 0, - 101, - 100, - 101, + 70, + 46, + 70, 0, 0, - 100, + 46, 0 ], "nuv": [ @@ -102,18 +102,18 @@ 1 ], "minPos": [ - -50, - -50.5, + -23, + -35, 0 ], "maxPos": [ - 50, - 50.5, + 23, + 35, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "818e77e0-06c7-49da-8bd4-8309c55f5760@6c48a", + "imageUuidOrDatabaseUri": "d5a2367a-5e87-44d0-95ef-557fae49c3f5@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "818e77e0-06c7-49da-8bd4-8309c55f5760@6c48a" + "redirect": "d5a2367a-5e87-44d0-95ef-557fae49c3f5@6c48a" } } diff --git a/assets/res/gemstone/texture/上方框体.png b/assets/res/gemstone/texture/上方框体.png new file mode 100644 index 0000000..40bf6e6 Binary files /dev/null and b/assets/res/gemstone/texture/上方框体.png differ diff --git a/assets/res/gemstone/texture/上方框体.png.meta b/assets/res/gemstone/texture/上方框体.png.meta new file mode 100644 index 0000000..65482e8 --- /dev/null +++ b/assets/res/gemstone/texture/上方框体.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "50d46675-c6e3-4e1e-b225-8fbae99f83cb", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "50d46675-c6e3-4e1e-b225-8fbae99f83cb@6c48a", + "displayName": "上方框体", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "50d46675-c6e3-4e1e-b225-8fbae99f83cb", + "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": "50d46675-c6e3-4e1e-b225-8fbae99f83cb@f9941", + "displayName": "上方框体", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 750, + "height": 676, + "rawWidth": 750, + "rawHeight": 676, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -375, + -338, + 0, + 375, + -338, + 0, + -375, + 338, + 0, + 375, + 338, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 676, + 750, + 676, + 0, + 0, + 750, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -375, + -338, + 0 + ], + "maxPos": [ + 375, + 338, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "50d46675-c6e3-4e1e-b225-8fbae99f83cb@6c48a", + "atlasUuid": "", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "redirect": "50d46675-c6e3-4e1e-b225-8fbae99f83cb@6c48a" + } +} diff --git a/assets/res/gemstone/texture/下方框体.png b/assets/res/gemstone/texture/下方框体.png new file mode 100644 index 0000000..2018a72 Binary files /dev/null and b/assets/res/gemstone/texture/下方框体.png differ diff --git a/assets/res/gemstone/texture/下方框体.png.meta b/assets/res/gemstone/texture/下方框体.png.meta new file mode 100644 index 0000000..e6fcd81 --- /dev/null +++ b/assets/res/gemstone/texture/下方框体.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "b8231678-85e2-4725-a202-c9d1b3bdc4b5", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "b8231678-85e2-4725-a202-c9d1b3bdc4b5@6c48a", + "displayName": "下方框体", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "b8231678-85e2-4725-a202-c9d1b3bdc4b5", + "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": "b8231678-85e2-4725-a202-c9d1b3bdc4b5@f9941", + "displayName": "下方框体", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 757, + "height": 788, + "rawWidth": 757, + "rawHeight": 788, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -378.5, + -394, + 0, + 378.5, + -394, + 0, + -378.5, + 394, + 0, + 378.5, + 394, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 788, + 757, + 788, + 0, + 0, + 757, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -378.5, + -394, + 0 + ], + "maxPos": [ + 378.5, + 394, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "b8231678-85e2-4725-a202-c9d1b3bdc4b5@6c48a", + "atlasUuid": "", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "redirect": "b8231678-85e2-4725-a202-c9d1b3bdc4b5@6c48a" + } +} diff --git a/assets/res/gemstone/texture/框-大-2.png b/assets/res/gemstone/texture/框-大-2.png deleted file mode 100644 index 3e924df..0000000 Binary files a/assets/res/gemstone/texture/框-大-2.png and /dev/null differ diff --git a/assets/res/gemstone/texture/框-大-4.png b/assets/res/gemstone/texture/框-大-4.png deleted file mode 100644 index f0142f3..0000000 Binary files a/assets/res/gemstone/texture/框-大-4.png and /dev/null differ diff --git a/assets/res/gemstone/texture/框-大.png b/assets/res/gemstone/texture/框-大.png deleted file mode 100644 index 8141a5b..0000000 Binary files a/assets/res/gemstone/texture/框-大.png and /dev/null differ diff --git a/assets/res/gemstone/texture/框-大-1.png b/assets/res/gemstone/texture/组 2874.png similarity index 55% rename from assets/res/gemstone/texture/框-大-1.png rename to assets/res/gemstone/texture/组 2874.png index 25e6bd3..6544235 100644 Binary files a/assets/res/gemstone/texture/框-大-1.png and b/assets/res/gemstone/texture/组 2874.png differ diff --git a/assets/res/gemstone/texture/组 2874.png.meta b/assets/res/gemstone/texture/组 2874.png.meta new file mode 100644 index 0000000..c1057de --- /dev/null +++ b/assets/res/gemstone/texture/组 2874.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "6a57e2af-8ae3-4273-8b8f-f9184ff51506", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "6a57e2af-8ae3-4273-8b8f-f9184ff51506@6c48a", + "displayName": "组 2874", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "6a57e2af-8ae3-4273-8b8f-f9184ff51506", + "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": "6a57e2af-8ae3-4273-8b8f-f9184ff51506@f9941", + "displayName": "组 2874", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 165, + "height": 177, + "rawWidth": 165, + "rawHeight": 177, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -82.5, + -88.5, + 0, + 82.5, + -88.5, + 0, + -82.5, + 88.5, + 0, + 82.5, + 88.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 177, + 165, + 177, + 0, + 0, + 165, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -82.5, + -88.5, + 0 + ], + "maxPos": [ + 82.5, + 88.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "6a57e2af-8ae3-4273-8b8f-f9184ff51506@6c48a", + "atlasUuid": "", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "redirect": "6a57e2af-8ae3-4273-8b8f-f9184ff51506@6c48a" + } +} diff --git a/assets/script/battle/view/CocosBagBoardView.ts b/assets/script/battle/view/CocosBagBoardView.ts index 1bfc145..bf18e66 100644 --- a/assets/script/battle/view/CocosBagBoardView.ts +++ b/assets/script/battle/view/CocosBagBoardView.ts @@ -447,6 +447,8 @@ export class CocosBagBoardView { this._grids.setMapGrid(gridIndex, grid); grid.enableDrag(this._canDrag()); this._bindDrag(grid); + // 绑键未变也会跳过 setData；putNode 可能关掉数字 Spine，须始终修字形 + grid.ensureBagGlyphVisible(); if (this._textDragDebugSeq > 0) { BagTextDragDebugLog.snap(this._textDragDebugSeq, 'commitMap', grid, `map=${gridIndex}`); } @@ -566,6 +568,7 @@ export class CocosBagBoardView { if (this._isGridBoundTo(onCell, entity)) { this._placeMapTextGrid(onCell, gridIndex); this._grids.setMapGrid(gridIndex, onCell); + onCell.ensureBagGlyphVisible(); return; } this._commitMapTextGridView(gridIndex, onCell); @@ -895,7 +898,10 @@ export class CocosBagBoardView { const live = this._resolveBagSlotLiveGrid(i, slotNode, slots[i].weapon2Id) ?? this.ensureBagSlotGrid(i); if (!live?.isValid) continue; const entity = this._buildBagSlotEntity(i); - if (entity && live.node.parent === slotNode && this._isGridBoundTo(live, entity)) continue; + if (entity && live.node.parent === slotNode && this._isGridBoundTo(live, entity)) { + live.ensureBagGlyphVisible(); + continue; + } this._commitBagTextGridView(i, live); } this._bagSession.merge.map.forEachTile((gridIndex) => { diff --git a/assets/script/battle/view/TextGrid.ts b/assets/script/battle/view/TextGrid.ts index f9505d4..9c51ac7 100644 --- a/assets/script/battle/view/TextGrid.ts +++ b/assets/script/battle/view/TextGrid.ts @@ -1925,8 +1925,17 @@ export class TextGrid extends Component { } this._hideNumberNodes(); const node = this._takeNumberNode(num); - if (!node) return; - if (!this._attachNumberNode(node)) return; + if (!node) { + // 出池失败时勿留下 skin Skeleton 已关、数字又无的空白格 + const skinSk = this._skinNode?.getComponent(sp.Skeleton); + if (skinSk?.isValid) skinSk.enabled = true; + return; + } + if (!this._attachNumberNode(node)) { + const skinSk = this._skinNode?.getComponent(sp.Skeleton); + if (skinSk?.isValid) skinSk.enabled = true; + return; + } this._numberNode = node; node.active = true; this._playElementSkin(node, skinName); diff --git a/assets/script/com/GemGrid.ts b/assets/script/com/GemGrid.ts index 6a1335e..c7372ec 100644 --- a/assets/script/com/GemGrid.ts +++ b/assets/script/com/GemGrid.ts @@ -9,7 +9,7 @@ const TAP_THRESHOLD = 18; /** * 宝石格子：仓库 / 获得弹窗共用。 - * bg=宝石框大{quality}；icon=Weapon.icon；lbNum=数量。 + * bg=宝石框大{quality}；icon=Weapon.icon；lbNum=数量；lbName=名称。 * 轻点打开 PopGemInfo（拖拽不触发）。 */ @ccclass('GemGrid') @@ -23,6 +23,8 @@ export class GemGrid extends Component { icon: Node = null!; /** 数量 */ lbNum: Label = null!; + /** 宝石名称 */ + lbName: Label = null!; /** 当前宝石配表 */ data: ITableWeapon | null = null; @@ -69,6 +71,7 @@ export class GemGrid extends Component { this._setSprite(this.bg, '', false); this._setSprite(this.icon, '', true); if (this.icon?.isValid) this.icon.active = false; + if (this.lbName?.isValid) this.lbName.string = ''; } else { if (quality < 1 || quality > 5) console.warn(LOG, '品质无对应宝石框大', data.id, quality); this._setSprite(this.bg, `weapon/宝石框大${quality}`, false); @@ -76,6 +79,7 @@ export class GemGrid extends Component { if (!iconName) console.warn(LOG, 'icon 缺失', data.id); this._setSprite(this.icon, iconName ? `weapon/${iconName}` : '', true); if (this.icon?.isValid) this.icon.active = !!iconName; + if (this.lbName?.isValid) this.lbName.string = String(data.name ?? '').trim(); } if (this.lbNum?.isValid) { const showNum = count >= 0; @@ -115,6 +119,10 @@ export class GemGrid extends Component { const n = this.node.getChildByName('lbNum'); this.lbNum = n?.getComponent(Label) ?? null!; } + if (!this.lbName?.isValid) { + const n = this.node.getChildByName('lbName'); + this.lbName = n?.getComponent(Label) ?? null!; + } if (!this.bg) console.warn(LOG, 'bg 节点缺失', this.node?.name); } diff --git a/assets/script/interface/AutoTable.ts b/assets/script/interface/AutoTable.ts index aeef25b..57d5e3e 100644 --- a/assets/script/interface/AutoTable.ts +++ b/assets/script/interface/AutoTable.ts @@ -278,10 +278,10 @@ declare global { 3、水 4、火 5、土 -10、双倍符（数字等级+1） -11、4倍符（数字等级+2） -12、随机牌（随机转换数字属性） -13、衰弱符（对方数字等级-1） */ +10、双倍符（拖到己方数字上，数字等级+1，最大到14级），此道具可以被拖进垃圾桶回收 +11、4倍符（拖到己方数字上，数字等级+2，最大到14级，14级数字拖动无效，弹文字提示：数字已达上限，无法使用！），此道具可以被拖进垃圾桶回收 +12、随机牌（拖到己方数字，随机转换数字属性，必定不会随机到当前属性），此道具可以被拖进垃圾桶回收 +13、衰弱符（拖动到敌方大于1级数字上，对方数字等级-1，对方1级数字无法使用，弹文字提示：数字已是最小值，无法使用），此道具可以被拖进垃圾桶回收 */ readonly type: number; /** 等级 */ readonly level: number; diff --git a/assets/script/ui/BattleGame/BattleWeaponDropPresenter.ts b/assets/script/ui/BattleGame/BattleWeaponDropPresenter.ts index d5a6764..ef0e320 100644 --- a/assets/script/ui/BattleGame/BattleWeaponDropPresenter.ts +++ b/assets/script/ui/BattleGame/BattleWeaponDropPresenter.ts @@ -11,8 +11,16 @@ import { BattleAudio } from '../../battle/audio/BattleAudio'; const { ccclass } = _decorator; -/** 战场掉落图标子节点名 */ +/** 战场宝石掉落预制体名（battleHero/prefab/weapon） */ +const WORLD_DROP_PREFAB = '宝石掉落'; +/** 暂停列表战利品预制体名（旧「武器」） */ +const PAUSE_LIST_PREFAB = '武器'; +/** 掉落/列表图标子节点名 */ const ICON_NODE = '图标'; +/** 战场掉落品质根节点（子节点名 1~4） */ +const QUALITY_ROOT = '品质'; +/** 品质子节点档位数 */ +const QUALITY_MAX = 4; /** 结算模板图标子节点名（ui_gemTemp/icon） */ const SETTLE_ICON_NODE = 'icon'; /** 碎片数量底节点名 */ @@ -21,12 +29,9 @@ const NUM_BG_NODE = 'numBg'; const NUM_LABEL_NODE = 'lb_weaponNum'; /** 暂停列表敌方角标节点名（预制体已挂贴图，仅控制显隐） */ const ENEMY_MARK_NODE = '敌方'; -/** 图标显示尺寸（与预制体一致） */ -const ICON_W = 68; -const ICON_H = 35; -/** 掉落根节点默认尺寸（与「武器」预制体 UITransform 一致） */ -const DROP_W = 88; -const DROP_H = 48; +/** 掉落根节点默认尺寸（与「宝石掉落」预制体 UITransform 一致） */ +const DROP_W = 101; +const DROP_H = 101; /** 重力（像素/秒²） */ const GRAVITY = -3200; /** 落地弹性 */ @@ -55,7 +60,7 @@ enum DropPhase { } /** - * 「武器」预制体掉落视图：物理落地、点击拾取、飞入暂停按钮。 + * 「宝石掉落」预制体视图：物理落地、点击拾取、飞入暂停按钮。 */ @ccclass('WeaponDropView') export class WeaponDropView extends Component { @@ -90,28 +95,66 @@ export class WeaponDropView extends Component { return node; } - /** 从节点池取「武器」预制体（战场掉落 / 暂停列表） */ + /** 从节点池取「宝石掉落」预制体（战场世界掉落） */ static takePrefab(): Node | null { + return WeaponDropView._takeNamedPrefab(WORLD_DROP_PREFAB); + } + + /** 从节点池取「武器」预制体（暂停战利品列表） */ + static takePauseListPrefab(): Node | null { + return WeaponDropView._takeNamedPrefab(PAUSE_LIST_PREFAB); + } + + /** + * 取 weapon 目录下指定预制体。 + * @param prefabName 预制体名 + */ + private static _takeNamedPrefab(prefabName: string): Node | null { let node: Node | null = null; try { - node = gg.res.getNode(`${BATTLE_HERO_WEAPON_PATH}/`, '武器', GBundle.BattleHero); + node = gg.res.getNode(`${BATTLE_HERO_WEAPON_PATH}/`, prefabName, GBundle.BattleHero); } catch (e) { - console.log('[WeaponDrop] 预制体加载异常', String(e)); + console.log('[WeaponDrop] 预制体加载异常', prefabName, String(e)); return null; } if (!node?.isValid) { - console.log('[WeaponDrop] 武器预制体缺失'); + console.log('[WeaponDrop] 预制体缺失', prefabName); return null; } return node; } /** - * 按宝石信息刷新底框与图标（掉落 / 暂停列表共用）。 - * @param node 「武器」预制体根节点（仍复用该预制） + * 战场掉落：品质光柱 + 图标。 + * @param node 「宝石掉落」根节点 * @param record 掉落记录 */ static applyVisual(node: Node, record: WeaponDropRecord): void { + WeaponDropView.clearFragmentCount(node); + const weapon = gg.equip.getEquip(record.weaponId); + if (!weapon) { + console.warn('[WeaponDrop] 宝石表缺失', record.weaponId); + return; + } + WeaponDropView._applyQualityMark(node, record.quality, record.weaponId); + const iconName = String(weapon.icon ?? '').trim(); + if (!iconName) { + console.warn('[WeaponDrop] icon 缺失', record.weaponId); + } + const icon = node.getChildByName(ICON_NODE); + if (!icon?.isValid) { + console.warn('[WeaponDrop] 缺少图标节点', record.weaponId); + return; + } + WeaponDropView._setSprite(icon, iconName ? `weapon/${iconName}` : '', true); + } + + /** + * 暂停列表：旧「武器」底框 + 图标。 + * @param node 「武器」根节点 + * @param record 掉落记录 + */ + static applyPauseListVisual(node: Node, record: WeaponDropRecord): void { WeaponDropView.clearFragmentCount(node); const weapon = gg.equip.getEquip(record.weaponId); if (!weapon) { @@ -225,7 +268,7 @@ export class WeaponDropView extends Component { } /** - * Weapon.quality → 宝石框大资源下标（现有资源 1~5）。 + * Weapon.quality → 宝石框大资源下标（结算模板用，现有资源 1~5）。 * @param quality 品质 * @param weaponId 宝石 id（仅日志） */ @@ -237,6 +280,32 @@ export class WeaponDropView extends Component { return q; } + /** + * 切换「品质」下 1~4 子节点（表品质 5 钳到 4）。 + * @param node 掉落根 + * @param quality Weapon.quality + * @param weaponId 宝石 id（日志） + */ + private static _applyQualityMark(node: Node, quality: number, weaponId: number): void { + const root = node.getChildByName(QUALITY_ROOT); + if (!root?.isValid) { + console.warn('[WeaponDrop] 缺少品质节点', weaponId); + return; + } + let q = Math.floor(Number(quality) || 0); + if (q < 1 || q > QUALITY_MAX) { + console.warn('[WeaponDrop] 品质越界，钳到 1~4', weaponId, quality); + q = Math.max(1, Math.min(QUALITY_MAX, q > 0 ? q : 1)); + } + const name = String(q); + const children = root.children; + for (let i = 0; i < children.length; i++) { + const child = children[i]; + if (!child?.isValid) continue; + child.active = child.name === name; + } + } + /** * 加载 icons/weapon 图。 * @param node 目标节点 diff --git a/assets/script/ui/BattlePause/UIBattlePause.ts b/assets/script/ui/BattlePause/UIBattlePause.ts index f391c39..6f01b88 100644 --- a/assets/script/ui/BattlePause/UIBattlePause.ts +++ b/assets/script/ui/BattlePause/UIBattlePause.ts @@ -138,12 +138,12 @@ export class UIBattlePause extends Auto_BattlePause { if (layout) layout.resizeMode = Layout.ResizeMode.CONTAINER; for (let i = 0; i < drops.length; i++) { const rec = drops[i]; - const node = WeaponDropView.takePrefab(); + const node = WeaponDropView.takePauseListPrefab(); if (!node) continue; list.addChild(node); node.setScale(1, 1, 1); node.angle = 0; - WeaponDropView.applyVisual(node, rec); + WeaponDropView.applyPauseListVisual(node, rec); const view = node.getComponent(WeaponDropView) ?? node.addComponent(WeaponDropView); view.playDisplay(); WeaponDropView.applySideMark(node, rec.isSelf); diff --git a/assets/script/ui/PanelGemstone/Auto_PanelGemstone.ts b/assets/script/ui/PanelGemstone/Auto_PanelGemstone.ts index 9d26979..ad205b0 100644 --- a/assets/script/ui/PanelGemstone/Auto_PanelGemstone.ts +++ b/assets/script/ui/PanelGemstone/Auto_PanelGemstone.ts @@ -24,8 +24,10 @@ const { ccclass } = _decorator; @ccclass('Auto_PanelGemstone') export class Auto_PanelGemstone extends UIBase { ui_center:Node; + sp_title:Sprite; ui_list:Node; - btnClose:Node; + btnLeft:Node; + btnRight:Node; ui_content:Node; ui_tagBtnBg:Node; ui_tagBtns:Node; @@ -36,24 +38,29 @@ export class Auto_PanelGemstone extends UIBase { btn4:Node; btn5:Node; btnFuse:Node; + btnClose:Node; onLoad(){ super.onLoad(); this.ui_center = find("ui_center",this.node); - this.ui_list = find("ui_center/ui_list",this.node); + this.sp_title = find("ui_center/top/sp_title",this.node)?.getComponent(Sprite); + this.ui_list = find("ui_center/top/ui_list",this.node); + this.btnLeft = find("ui_center/top/btnLeft",this.node); + this.btnRight = find("ui_center/top/btnRight",this.node); + this.ui_content = find("ui_center/down/ui_content",this.node); + this.ui_tagBtnBg = find("ui_center/down/tags/ui_tagBtnBg",this.node); + this.ui_tagBtns = find("ui_center/down/tags/ui_tagBtns",this.node); + this.btn0 = find("ui_center/down/tags/ui_tagBtns/btn0",this.node); + this.btn1 = find("ui_center/down/tags/ui_tagBtns/btn1",this.node); + this.btn2 = find("ui_center/down/tags/ui_tagBtns/btn2",this.node); + this.btn3 = find("ui_center/down/tags/ui_tagBtns/btn3",this.node); + this.btn4 = find("ui_center/down/tags/ui_tagBtns/btn4",this.node); + this.btn5 = find("ui_center/down/tags/ui_tagBtns/btn5",this.node); + this.btnFuse = find("ui_center/down/btnFuse",this.node); this.btnClose = find("ui_center/btnClose",this.node); - this.ui_content = find("ui_center/ui_content",this.node); - this.ui_tagBtnBg = find("ui_center/tags/ui_tagBtnBg",this.node); - this.ui_tagBtns = find("ui_center/tags/ui_tagBtns",this.node); - this.btn0 = find("ui_center/tags/ui_tagBtns/btn0",this.node); - this.btn1 = find("ui_center/tags/ui_tagBtns/btn1",this.node); - this.btn2 = find("ui_center/tags/ui_tagBtns/btn2",this.node); - this.btn3 = find("ui_center/tags/ui_tagBtns/btn3",this.node); - this.btn4 = find("ui_center/tags/ui_tagBtns/btn4",this.node); - this.btn5 = find("ui_center/tags/ui_tagBtns/btn5",this.node); - this.btnFuse = find("ui_center/btnFuse",this.node); } onEnable() { - this.btnClose.on(Node.EventType.TOUCH_END, this.click_btnClose, this); + this.btnLeft.on(Node.EventType.TOUCH_END, this.click_btnLeft, this); + this.btnRight.on(Node.EventType.TOUCH_END, this.click_btnRight, this); this.btn0.on(Node.EventType.TOUCH_END, this.click_btn0, this); this.btn1.on(Node.EventType.TOUCH_END, this.click_btn1, this); this.btn2.on(Node.EventType.TOUCH_END, this.click_btn2, this); @@ -61,9 +68,11 @@ export class Auto_PanelGemstone extends UIBase { this.btn4.on(Node.EventType.TOUCH_END, this.click_btn4, this); this.btn5.on(Node.EventType.TOUCH_END, this.click_btn5, this); this.btnFuse.on(Node.EventType.TOUCH_END, this.click_btnFuse, this); + this.btnClose.on(Node.EventType.TOUCH_END, this.click_btnClose, this); } onDisable() { - this.btnClose.off(Node.EventType.TOUCH_END, this.click_btnClose, this); + this.btnLeft.off(Node.EventType.TOUCH_END, this.click_btnLeft, this); + this.btnRight.off(Node.EventType.TOUCH_END, this.click_btnRight, this); this.btn0.off(Node.EventType.TOUCH_END, this.click_btn0, this); this.btn1.off(Node.EventType.TOUCH_END, this.click_btn1, this); this.btn2.off(Node.EventType.TOUCH_END, this.click_btn2, this); @@ -71,8 +80,10 @@ export class Auto_PanelGemstone extends UIBase { this.btn4.off(Node.EventType.TOUCH_END, this.click_btn4, this); this.btn5.off(Node.EventType.TOUCH_END, this.click_btn5, this); this.btnFuse.off(Node.EventType.TOUCH_END, this.click_btnFuse, this); + this.btnClose.off(Node.EventType.TOUCH_END, this.click_btnClose, this); } - click_btnClose() {} + click_btnLeft() {} + click_btnRight() {} click_btn0() {} click_btn1() {} click_btn2() {} @@ -80,4 +91,5 @@ export class Auto_PanelGemstone extends UIBase { click_btn4() {} click_btn5() {} click_btnFuse() {} + click_btnClose() {} } \ No newline at end of file diff --git a/assets/script/ui/PanelGemstone/UIPanelGemstone.ts b/assets/script/ui/PanelGemstone/UIPanelGemstone.ts index acbbf94..eb10a89 100644 --- a/assets/script/ui/PanelGemstone/UIPanelGemstone.ts +++ b/assets/script/ui/PanelGemstone/UIPanelGemstone.ts @@ -4,7 +4,7 @@ // time: Wed Oct 07 2026 // desc: 宝石镶嵌 / 页签仓库 / 一键合成 //********************* -import { _decorator, EventMouse, EventTouch, Input, input, instantiate, Node, sp, Sprite, UIOpacity, UITransform, Vec2, Vec3 } from 'cc'; +import { _decorator, EventMouse, EventTouch, Input, input, instantiate, Label, Node, find, sp, Sprite, UIOpacity, UITransform, Vec2, Vec3 } from 'cc'; import { SpriteLoad } from 'db://assets/mx/components/SpriteLoad'; import { ensureSpineSkeletonDataRuntime } from 'db://assets/mx/module/lang/spineRuntimePatch'; import { GemGrid } from '../../com/GemGrid'; @@ -19,28 +19,33 @@ const LOG = '[PanelGemstone]'; const DRAG_THRESHOLD = 18; const GHOST_OPACITY = 180; const ELEMENT_COUNT = 5; -const SLOT_NAMES = ['g1', 'g2', 'g3', 'g4']; const ELEMENT_SKINS = ['', '金', '木', '水', '火', '土']; /** 仓库每帧实例化数量 */ const BAG_PER_FRAME = 6; /** 默认页签：通用 Weapon.type=1 */ const DEFAULT_FILTER = 1; +/** 默认展示五行：金 */ +const DEFAULT_ELEMENT = 1; /** - * 宝石页：五行镶嵌 + 页签仓库（无滚动）+ 拖拽镶嵌/卸下 + 一键合成。 + * 宝石页：左右切五行镶嵌 + 页签仓库 + 拖拽镶嵌/卸下 + 一键合成。 * 页签 btn0~btn5 → type 1~6（通用/金/木/水/火/土），默认通用。 */ @ccclass('UIPanelGemstone') export class UIPanelGemstone extends Auto_PanelGemstone { - /** 五行格子模板 */ + /** 镶嵌格模板 */ private _itemTpl: Node | null = null; /** 仓库格子模板 */ private _bagTpl: Node | null = null; - /** 已创建的五行格 */ - private _elementItems: Node[] = []; + /** 当前五行的 4 个镶嵌格 */ + private _slotItems: Node[] = []; /** 仓库动态格 */ private _bagItems: Node[] = []; + /** 当前展示五行 1~5 */ + private _currentElement = DEFAULT_ELEMENT; + /** 顶部五行数字 Spine */ + private _skSkin: sp.Skeleton | null = null; /** 当前筛选：1 通用；2~6 金木水火土 */ private _filterType = DEFAULT_FILTER; /** 仓库数据 */ @@ -72,6 +77,7 @@ export class UIPanelGemstone extends Auto_PanelGemstone { if (this._itemTpl) this._itemTpl.active = false; this._bagTpl = this.ui_content?.getChildByName('bagItemTemplate') ?? null; if (this._bagTpl) this._bagTpl.active = false; + this._skSkin = find('ui_center/top/sk_skin', this.node)?.getComponent(sp.Skeleton) ?? null; this._bindDrag(true); } @@ -89,6 +95,7 @@ export class UIPanelGemstone extends Auto_PanelGemstone { onInit(): void { this._filterType = DEFAULT_FILTER; + this._currentElement = DEFAULT_ELEMENT; this._selectTag(this.btn0); void this._refresh(); } @@ -97,6 +104,16 @@ export class UIPanelGemstone extends Auto_PanelGemstone { void this.close(2); } + click_btnLeft(): void { + const next = this._currentElement <= 1 ? ELEMENT_COUNT : this._currentElement - 1; + this._setElement(next); + } + + click_btnRight(): void { + const next = this._currentElement >= ELEMENT_COUNT ? 1 : this._currentElement + 1; + this._setElement(next); + } + click_btn0(): void { this._onTag(1, this.btn0); } click_btn1(): void { this._onTag(2, this.btn1); } click_btn2(): void { this._onTag(3, this.btn2); } @@ -107,7 +124,7 @@ export class UIPanelGemstone extends Auto_PanelGemstone { click_btnFuse(): void { const gains = gg.gem.fuseAll(); this._rebuildBag(); - this._refreshAllSlots(); + this._refreshSlots(); if (!gains.length) { gg.ui.showToast('没有可合成的宝石'); return; @@ -133,44 +150,56 @@ export class UIPanelGemstone extends Auto_PanelGemstone { private async _refresh(): Promise { await gg.gem.ensureTable(); if (!this.isValid) return; - this._buildElements(); + this._ensureSlotItems(); + this._applyElementVisual(); + this._refreshSlots(); this._rebuildBag(); } - /** 实例化五行 */ - private _buildElements(): void { - if (!this.ui_list?.isValid || !this._itemTpl?.isValid) { - console.warn(LOG, 'ui_list/itemTemplate 缺失'); + /** + * 切换当前五行。 + * @param element 1~5 + */ + private _setElement(element: number): void { + const e = Math.floor(Number(element) || 0); + if (e < 1 || e > ELEMENT_COUNT) { + console.warn(LOG, '五行非法', element); return; } - for (let i = 0; i < this._elementItems.length; i++) { - const n = this._elementItems[i]; - if (n?.isValid) n.destroy(); - } - this._elementItems.length = 0; - for (let e = 1; e <= ELEMENT_COUNT; e++) { - const node = instantiate(this._itemTpl); - node.parent = this.ui_list; - node.active = true; - node.name = `element_${e}`; - (node as any)._element = e; - this._applyNumSkin(node, e); - this._refreshElementSlots(node, e); - this._elementItems.push(node); + if (this._currentElement === e) return; + this._currentElement = e; + this._applyElementVisual(); + this._refreshSlots(); + } + + /** 标题图 + 数字皮肤 */ + private _applyElementVisual(): void { + this._applyTitle(); + this._applySkin(); + } + + /** sp_title 加载 title_1~5 */ + private _applyTitle(): void { + const spNode = this.sp_title?.node; + if (!spNode?.isValid) { + console.warn(LOG, 'sp_title 缺失'); + return; } + const path = `texture/title_${this._currentElement}`; + if (!spNode.getComponent(Sprite)) spNode.addComponent(Sprite); + spNode.getOrAddComponent(SpriteLoad).setSprite(path, GBundle.Gemstone); } - /** numSkin 切五行皮肤 */ - private _applyNumSkin(item: Node, element: number): void { - const skinNode = item.getChildByName('numSkin'); - const sk = skinNode?.getComponent(sp.Skeleton); - if (!sk) { - console.warn(LOG, 'numSkin Skeleton 缺失', element); + /** sk_skin 切五行皮肤 */ + private _applySkin(): void { + const sk = this._skSkin; + if (!sk?.isValid) { + console.warn(LOG, 'sk_skin Skeleton 缺失'); return; } - const skin = ELEMENT_SKINS[element] || ''; + const skin = ELEMENT_SKINS[this._currentElement] || ''; if (!skin) { - console.warn(LOG, '五行皮肤名无效', element); + console.warn(LOG, '五行皮肤名无效', this._currentElement); return; } if (sk.skeletonData) ensureSpineSkeletonDataRuntime(sk.skeletonData); @@ -183,41 +212,65 @@ export class UIPanelGemstone extends Auto_PanelGemstone { } } - /** 刷新某一行五行的 4 槽 */ - private _refreshElementSlots(item: Node, element: number): void { - const slots = gg.gem.getElementSlots(element); + /** 打开时初始化 4 个镶嵌格（只建一次） */ + private _ensureSlotItems(): void { + if (!this.ui_list?.isValid || !this._itemTpl?.isValid) { + console.warn(LOG, 'ui_list/itemTemplate 缺失'); + return; + } + if (this._slotItems.length === GEM_SLOT_COUNT) return; + for (let i = 0; i < this._slotItems.length; i++) { + const n = this._slotItems[i]; + if (n?.isValid) n.destroy(); + } + this._slotItems.length = 0; for (let s = 0; s < GEM_SLOT_COUNT; s++) { - const slotNode = item.getChildByName(SLOT_NAMES[s]); - if (!slotNode?.isValid) { - console.warn(LOG, '镶嵌位缺失', SLOT_NAMES[s], element); - continue; - } - (slotNode as any)._element = element; - (slotNode as any)._slot = s; - this._paintSlot(slotNode, slots[s] || 0); + const node = instantiate(this._itemTpl); + node.parent = this.ui_list; + node.active = true; + node.name = `slot_${s}`; + (node as any)._slot = s; + this._slotItems.push(node); } } - /** 刷新全部镶嵌 */ - private _refreshAllSlots(): void { - for (let i = 0; i < this._elementItems.length; i++) { - const item = this._elementItems[i]; - const e = Number((item as any)?._element) || (i + 1); - this._refreshElementSlots(item, e); + /** 刷新当前五行 4 槽 */ + private _refreshSlots(): void { + this._ensureSlotItems(); + const slots = gg.gem.getElementSlots(this._currentElement); + for (let s = 0; s < this._slotItems.length; s++) { + const node = this._slotItems[s]; + if (!node?.isValid) continue; + (node as any)._element = this._currentElement; + (node as any)._slot = s; + this._paintSlot(node, slots[s] || 0); } } - /** 画单个镶嵌位 */ + /** + * 画单个镶嵌格：空位 qbg=宝石框小0、icon 空；有宝石写 qbg/icon/lbName。 + * @param slotNode itemTemplate 实例 + * @param gemId 宝石 id；0=空 + */ private _paintSlot(slotNode: Node, gemId: number): void { - const bg = slotNode.getChildByName('bg'); + const qbg = slotNode.getChildByName('qbg'); const icon = slotNode.getChildByName('icon'); + const lbName = slotNode.getChildByName('lbName')?.getComponent(Label); const conf = gemId > 0 ? gg.gem.getGem(gemId) : null; - const quality = conf ? Math.floor(Number(conf.quality) || 0) : 0; - this._setWeaponSprite(bg, `weapon/宝石框小${Math.max(0, Math.min(5, quality))}`); - const iconName = conf ? String(conf.icon || '').trim() : ''; - if (conf && !iconName) console.warn(LOG, 'icon 缺失', gemId); + if (!conf) { + this._setWeaponSprite(qbg, 'weapon/宝石框小0'); + this._setWeaponSprite(icon, ''); + if (icon?.isValid) icon.active = false; + if (lbName?.isValid) lbName.string = ''; + return; + } + const quality = Math.floor(Number(conf.quality) || 0); + this._setWeaponSprite(qbg, `weapon/宝石框小${Math.max(0, Math.min(5, quality))}`); + const iconName = String(conf.icon || '').trim(); + if (!iconName) console.warn(LOG, 'icon 缺失', gemId); this._setWeaponSprite(icon, iconName ? `weapon/${iconName}` : ''); if (icon?.isValid) icon.active = !!iconName; + if (lbName?.isValid) lbName.string = String(conf.name ?? '').trim(); } /** @@ -418,7 +471,6 @@ export class UIPanelGemstone extends Auto_PanelGemstone { this._finishDrag(loc); return; } - // 镶嵌槽轻点看信息；仓库格由 GemGrid 自行处理 const gemId = this._dragGemId; const fromSlot = this._dragFromElement > 0 && this._dragFromSlot >= 0; this._endDrag(); @@ -450,7 +502,7 @@ export class UIPanelGemstone extends Auto_PanelGemstone { gg.ui.showToast('无法镶嵌到该位置'); return; } - this._refreshAllSlots(); + this._refreshSlots(); return; } const before = gg.gem.getSlotGem(te, ts); @@ -458,7 +510,7 @@ export class UIPanelGemstone extends Auto_PanelGemstone { gg.ui.showToast('无法镶嵌到该位置'); return; } - this._refreshAllSlots(); + this._refreshSlots(); const patch = [gemId]; if (before > 0 && before !== gemId) patch.push(before); this._patchBagGems(patch); @@ -469,7 +521,7 @@ export class UIPanelGemstone extends Auto_PanelGemstone { const worn = gg.gem.getSlotGem(fromE, fromS); if (worn <= 0) return; if (!gg.gem.unequip(fromE, fromS)) return; - this._refreshAllSlots(); + this._refreshSlots(); this._patchBagGems([worn]); } } @@ -532,15 +584,11 @@ export class UIPanelGemstone extends Auto_PanelGemstone { private _hitSlot(loc: Vec2): Node | null { this._hitPos.set(loc.x, loc.y); - for (let i = 0; i < this._elementItems.length; i++) { - const item = this._elementItems[i]; + for (let i = 0; i < this._slotItems.length; i++) { + const item = this._slotItems[i]; if (!item?.activeInHierarchy) continue; - for (let s = 0; s < SLOT_NAMES.length; s++) { - const slot = item.getChildByName(SLOT_NAMES[s]); - if (!slot?.activeInHierarchy) continue; - const ut = slot.getComponent(UITransform); - if (ut?.getBoundingBoxToWorld().contains(this._hitPos)) return slot; - } + const ut = item.getComponent(UITransform); + if (ut?.getBoundingBoxToWorld().contains(this._hitPos)) return item; } return null; } diff --git a/docs/需求-宝石装备合成.md b/docs/需求-宝石装备合成.md index 411b4c2..efb4a6d 100644 --- a/docs/需求-宝石装备合成.md +++ b/docs/需求-宝石装备合成.md @@ -40,10 +40,12 @@ ## UI 注意 +- 顶部 `btnLeft` / `btnRight` 切换当前五行（1~5）；`sp_title` 加载 `gemstone/texture/title_{element}`；`sk_skin` 切 金木水火土 皮肤。 +- `ui_list` 打开即建 4 个 `itemTemplate`：空槽 `qbg=宝石框小0`、icon 空；有宝石写 `qbg/icon/lbName`。 - 仓库按页签展示，无「全部」、无滚动：`btn0~btn5` → `Weapon.type` 1~6（通用/金木水火土），默认通用。 -- 仓库格分帧实例化进 `ui_content`（Layout 排布）；交互为直接拖拽镶嵌/卸下。 +- 仓库格分帧实例化进 `ui_content`（Layout 排布）；`bagItemTemplate` 含 `lbName`；交互为直接拖拽镶嵌/卸下。 - 仓库全量重建仅：打开页 / 切页签 / 一键合成。镶嵌成功只局部改数量与槽位；失败不刷列表。 -- 仓库项 `bg` 用 `宝石框大{quality}`；镶嵌位 `g1~g4` 仍用 `宝石框小`。 +- 仓库项 `bg` 用 `宝石框大{quality}`；镶嵌位 `qbg` 用 `宝石框小`。 ## 局内（已接入） diff --git a/docs/需求-装备掉落.md b/docs/需求-装备掉落.md index c96d378..485e170 100644 --- a/docs/需求-装备掉落.md +++ b/docs/需求-装备掉落.md @@ -20,4 +20,4 @@ - 逻辑：`assets/script/battle/combat/WeaponDropService.ts` - 概率：`Monster.weapondrop + Rank.weapondrop`（段位加值，与老项目一致） - 选品：本关 `Level.expdrop`（`宝石id,权重|...`） -- 表现：仍复用战场「武器」预制体；底框改 `icons/weapon/宝石框大{quality}`（1~5），图标读 `Weapon.icon`。 +- 表现：战场世界掉落用 `宝石掉落`（`品质/1~4` + `图标`）；暂停列表仍用旧「武器」+ `宝石框大{quality}`；结算列表用 `ui_gemTemp`。