diff --git a/assets/bundles/battleGame/prefab/BattleGame.prefab b/assets/bundles/battleGame/prefab/BattleGame.prefab index 6364c8f..d0baccc 100644 --- a/assets/bundles/battleGame/prefab/BattleGame.prefab +++ b/assets/bundles/battleGame/prefab/BattleGame.prefab @@ -43,53 +43,53 @@ "__id__": 189 }, { - "__id__": 697 + "__id__": 698 }, { - "__id__": 773 + "__id__": 774 }, { - "__id__": 779 + "__id__": 780 }, { - "__id__": 783 + "__id__": 784 }, { - "__id__": 797 + "__id__": 798 }, { - "__id__": 825 + "__id__": 826 }, { - "__id__": 853 + "__id__": 854 }, { - "__id__": 881 + "__id__": 886 } ], "_active": true, "_components": [ { - "__id__": 913 + "__id__": 918 }, { - "__id__": 915 + "__id__": 920 }, { - "__id__": 917 + "__id__": 922 }, { - "__id__": 919 + "__id__": 924 }, { - "__id__": 921 + "__id__": 926 }, { - "__id__": 923 + "__id__": 928 } ], "_prefab": { - "__id__": 925 + "__id__": 930 }, "_lpos": { "__type__": "cc.Vec3", @@ -2200,7 +2200,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -23, + "y": -10.519, "z": 0 }, "_lrot": { @@ -3537,8 +3537,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 68.771, - "y": -95.638, + "x": -279.755, + "y": -55.206, "z": 0 }, "_lrot": { @@ -3949,14 +3949,14 @@ "_active": true, "_components": [ { - "__id__": 692 + "__id__": 693 }, { - "__id__": 694 + "__id__": 695 } ], "_prefab": { - "__id__": 696 + "__id__": 697 }, "_lpos": { "__type__": "cc.Vec3", @@ -4030,20 +4030,20 @@ "__id__": 622 }, { - "__id__": 641 + "__id__": 642 }, { - "__id__": 647 + "__id__": 648 } ], "_active": true, "_components": [ { - "__id__": 689 + "__id__": 690 } ], "_prefab": { - "__id__": 691 + "__id__": 692 }, "_lpos": { "__type__": "cc.Vec3", @@ -11865,18 +11865,18 @@ "_active": true, "_components": [ { - "__id__": 636 + "__id__": 637 }, { - "__id__": 638 + "__id__": 639 } ], "_prefab": { - "__id__": 640 + "__id__": 641 }, "_lpos": { "__type__": "cc.Vec3", - "x": 150.159, + "x": -91.054, "y": 312.94, "z": 0 }, @@ -11958,6 +11958,9 @@ }, { "__id__": 634 + }, + { + "__id__": 636 } ], "removedComponents": [] @@ -11988,7 +11991,7 @@ ], "value": { "__type__": "cc.Vec3", - "x": 35, + "x": 21, "y": 0, "z": 0 } @@ -12032,7 +12035,7 @@ "propertyPath": [ "_active" ], - "value": false + "value": true }, { "__type__": "CCPropertyOverrideInfo", @@ -12071,6 +12074,21 @@ "ceEPbL/01FJoNd5wyHzdGS" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 627 + }, + "propertyPath": [ + "_lscale" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0.6, + "y": 0.6, + "z": 1 + } + }, { "__type__": "cc.UITransform", "_name": "", @@ -12081,11 +12099,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 637 + "__id__": 638 }, "_contentSize": { "__type__": "cc.Size", - "width": -20, + "width": 42, "height": 70 }, "_anchorPoint": { @@ -12109,7 +12127,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 639 + "__id__": 640 }, "_resizeMode": 1, "_layoutType": 1, @@ -12123,13 +12141,13 @@ "_paddingRight": 0, "_paddingTop": 0, "_paddingBottom": 0, - "_spacingX": 20, + "_spacingX": 10, "_spacingY": 0, "_verticalDirection": 1, "_horizontalDirection": 0, "_constraint": 0, "_constraintNum": 2, - "_affectedByScale": false, + "_affectedByScale": true, "_isAlign": false, "_id": "" }, @@ -12162,14 +12180,14 @@ "_active": false, "_components": [ { - "__id__": 642 + "__id__": 643 }, { - "__id__": 644 + "__id__": 645 } ], "_prefab": { - "__id__": 646 + "__id__": 647 }, "_lpos": { "__type__": "cc.Vec3", @@ -12206,11 +12224,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 641 + "__id__": 642 }, "_enabled": true, "__prefab": { - "__id__": 643 + "__id__": 644 }, "_contentSize": { "__type__": "cc.Size", @@ -12234,11 +12252,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 641 + "__id__": 642 }, "_enabled": true, "__prefab": { - "__id__": 645 + "__id__": 646 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12296,40 +12314,40 @@ }, "_children": [ { - "__id__": 648 + "__id__": 649 }, { - "__id__": 654 + "__id__": 655 }, { - "__id__": 660 + "__id__": 661 }, { - "__id__": 666 + "__id__": 667 }, { - "__id__": 672 + "__id__": 673 }, { - "__id__": 678 + "__id__": 679 } ], - "_active": false, + "_active": true, "_components": [ { - "__id__": 684 + "__id__": 685 }, { - "__id__": 686 + "__id__": 687 } ], "_prefab": { - "__id__": 688 + "__id__": 689 }, "_lpos": { "__type__": "cc.Vec3", - "x": 310, - "y": 375, + "x": 293.113, + "y": 327.097, "z": 0 }, "_lrot": { @@ -12361,20 +12379,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 647 + "__id__": 648 }, "_children": [], "_active": true, "_components": [ { - "__id__": 649 + "__id__": 650 }, { - "__id__": 651 + "__id__": 652 } ], "_prefab": { - "__id__": 653 + "__id__": 654 }, "_lpos": { "__type__": "cc.Vec3", @@ -12411,11 +12429,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 648 + "__id__": 649 }, "_enabled": true, "__prefab": { - "__id__": 650 + "__id__": 651 }, "_contentSize": { "__type__": "cc.Size", @@ -12439,11 +12457,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 648 + "__id__": 649 }, "_enabled": true, "__prefab": { - "__id__": 652 + "__id__": 653 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12497,20 +12515,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 647 + "__id__": 648 }, "_children": [], "_active": false, "_components": [ { - "__id__": 655 + "__id__": 656 }, { - "__id__": 657 + "__id__": 658 } ], "_prefab": { - "__id__": 659 + "__id__": 660 }, "_lpos": { "__type__": "cc.Vec3", @@ -12547,11 +12565,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 654 + "__id__": 655 }, "_enabled": true, "__prefab": { - "__id__": 656 + "__id__": 657 }, "_contentSize": { "__type__": "cc.Size", @@ -12575,11 +12593,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 654 + "__id__": 655 }, "_enabled": true, "__prefab": { - "__id__": 658 + "__id__": 659 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12633,20 +12651,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 647 + "__id__": 648 }, "_children": [], "_active": true, "_components": [ { - "__id__": 661 + "__id__": 662 }, { - "__id__": 663 + "__id__": 664 } ], "_prefab": { - "__id__": 665 + "__id__": 666 }, "_lpos": { "__type__": "cc.Vec3", @@ -12683,11 +12701,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 660 + "__id__": 661 }, "_enabled": true, "__prefab": { - "__id__": 662 + "__id__": 663 }, "_contentSize": { "__type__": "cc.Size", @@ -12711,11 +12729,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 660 + "__id__": 661 }, "_enabled": true, "__prefab": { - "__id__": 664 + "__id__": 665 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12769,20 +12787,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 647 + "__id__": 648 }, "_children": [], "_active": true, "_components": [ { - "__id__": 667 + "__id__": 668 }, { - "__id__": 669 + "__id__": 670 } ], "_prefab": { - "__id__": 671 + "__id__": 672 }, "_lpos": { "__type__": "cc.Vec3", @@ -12819,11 +12837,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 666 + "__id__": 667 }, "_enabled": true, "__prefab": { - "__id__": 668 + "__id__": 669 }, "_contentSize": { "__type__": "cc.Size", @@ -12847,11 +12865,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 666 + "__id__": 667 }, "_enabled": true, "__prefab": { - "__id__": 670 + "__id__": 671 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12905,20 +12923,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 647 + "__id__": 648 }, "_children": [], "_active": true, "_components": [ { - "__id__": 673 + "__id__": 674 }, { - "__id__": 675 + "__id__": 676 } ], "_prefab": { - "__id__": 677 + "__id__": 678 }, "_lpos": { "__type__": "cc.Vec3", @@ -12955,11 +12973,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 672 + "__id__": 673 }, "_enabled": true, "__prefab": { - "__id__": 674 + "__id__": 675 }, "_contentSize": { "__type__": "cc.Size", @@ -12983,11 +13001,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 672 + "__id__": 673 }, "_enabled": true, "__prefab": { - "__id__": 676 + "__id__": 677 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13041,20 +13059,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 647 + "__id__": 648 }, "_children": [], "_active": true, "_components": [ { - "__id__": 679 + "__id__": 680 }, { - "__id__": 681 + "__id__": 682 } ], "_prefab": { - "__id__": 683 + "__id__": 684 }, "_lpos": { "__type__": "cc.Vec3", @@ -13091,11 +13109,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 678 + "__id__": 679 }, "_enabled": true, "__prefab": { - "__id__": 680 + "__id__": 681 }, "_contentSize": { "__type__": "cc.Size", @@ -13119,11 +13137,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 678 + "__id__": 679 }, "_enabled": true, "__prefab": { - "__id__": 682 + "__id__": 683 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13200,11 +13218,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 647 + "__id__": 648 }, "_enabled": true, "__prefab": { - "__id__": 685 + "__id__": 686 }, "_contentSize": { "__type__": "cc.Size", @@ -13228,11 +13246,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 647 + "__id__": 648 }, "_enabled": true, "__prefab": { - "__id__": 687 + "__id__": 688 }, "clickEvents": [], "_interactable": true, @@ -13301,7 +13319,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 690 + "__id__": 691 }, "_contentSize": { "__type__": "cc.Size", @@ -13342,7 +13360,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 693 + "__id__": 694 }, "_contentSize": { "__type__": "cc.Size", @@ -13370,7 +13388,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 695 + "__id__": 696 }, "_alignFlags": 4, "_target": null, @@ -13419,56 +13437,56 @@ }, "_children": [ { - "__id__": 698 + "__id__": 699 }, { - "__id__": 704 + "__id__": 705 }, { - "__id__": 710 + "__id__": 711 }, { - "__id__": 716 + "__id__": 717 }, { - "__id__": 722 + "__id__": 723 }, { - "__id__": 728 + "__id__": 729 }, { - "__id__": 734 + "__id__": 735 }, { - "__id__": 740 + "__id__": 741 }, { - "__id__": 746 + "__id__": 747 }, { - "__id__": 752 + "__id__": 753 }, { - "__id__": 758 + "__id__": 759 } ], "_active": false, "_components": [ { - "__id__": 764 + "__id__": 765 }, { - "__id__": 766 + "__id__": 767 }, { - "__id__": 768 + "__id__": 769 }, { - "__id__": 770 + "__id__": 771 } ], "_prefab": { - "__id__": 772 + "__id__": 773 }, "_lpos": { "__type__": "cc.Vec3", @@ -13505,20 +13523,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 697 + "__id__": 698 }, "_children": [], "_active": true, "_components": [ { - "__id__": 699 + "__id__": 700 }, { - "__id__": 701 + "__id__": 702 } ], "_prefab": { - "__id__": 703 + "__id__": 704 }, "_lpos": { "__type__": "cc.Vec3", @@ -13555,11 +13573,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 698 + "__id__": 699 }, "_enabled": true, "__prefab": { - "__id__": 700 + "__id__": 701 }, "_contentSize": { "__type__": "cc.Size", @@ -13583,11 +13601,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 698 + "__id__": 699 }, "_enabled": true, "__prefab": { - "__id__": 702 + "__id__": 703 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13641,20 +13659,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 697 + "__id__": 698 }, "_children": [], "_active": true, "_components": [ { - "__id__": 705 + "__id__": 706 }, { - "__id__": 707 + "__id__": 708 } ], "_prefab": { - "__id__": 709 + "__id__": 710 }, "_lpos": { "__type__": "cc.Vec3", @@ -13691,11 +13709,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 704 + "__id__": 705 }, "_enabled": true, "__prefab": { - "__id__": 706 + "__id__": 707 }, "_contentSize": { "__type__": "cc.Size", @@ -13719,11 +13737,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 704 + "__id__": 705 }, "_enabled": true, "__prefab": { - "__id__": 708 + "__id__": 709 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13777,20 +13795,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 697 + "__id__": 698 }, "_children": [], "_active": true, "_components": [ { - "__id__": 711 + "__id__": 712 }, { - "__id__": 713 + "__id__": 714 } ], "_prefab": { - "__id__": 715 + "__id__": 716 }, "_lpos": { "__type__": "cc.Vec3", @@ -13827,11 +13845,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 710 + "__id__": 711 }, "_enabled": true, "__prefab": { - "__id__": 712 + "__id__": 713 }, "_contentSize": { "__type__": "cc.Size", @@ -13855,11 +13873,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 710 + "__id__": 711 }, "_enabled": true, "__prefab": { - "__id__": 714 + "__id__": 715 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13913,20 +13931,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 697 + "__id__": 698 }, "_children": [], "_active": true, "_components": [ { - "__id__": 717 + "__id__": 718 }, { - "__id__": 719 + "__id__": 720 } ], "_prefab": { - "__id__": 721 + "__id__": 722 }, "_lpos": { "__type__": "cc.Vec3", @@ -13963,11 +13981,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 716 + "__id__": 717 }, "_enabled": true, "__prefab": { - "__id__": 718 + "__id__": 719 }, "_contentSize": { "__type__": "cc.Size", @@ -13991,11 +14009,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 716 + "__id__": 717 }, "_enabled": true, "__prefab": { - "__id__": 720 + "__id__": 721 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14049,20 +14067,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 697 + "__id__": 698 }, "_children": [], "_active": true, "_components": [ { - "__id__": 723 + "__id__": 724 }, { - "__id__": 725 + "__id__": 726 } ], "_prefab": { - "__id__": 727 + "__id__": 728 }, "_lpos": { "__type__": "cc.Vec3", @@ -14099,11 +14117,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 722 + "__id__": 723 }, "_enabled": true, "__prefab": { - "__id__": 724 + "__id__": 725 }, "_contentSize": { "__type__": "cc.Size", @@ -14127,11 +14145,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 722 + "__id__": 723 }, "_enabled": true, "__prefab": { - "__id__": 726 + "__id__": 727 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14185,20 +14203,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 697 + "__id__": 698 }, "_children": [], "_active": true, "_components": [ { - "__id__": 729 + "__id__": 730 }, { - "__id__": 731 + "__id__": 732 } ], "_prefab": { - "__id__": 733 + "__id__": 734 }, "_lpos": { "__type__": "cc.Vec3", @@ -14235,11 +14253,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 728 + "__id__": 729 }, "_enabled": true, "__prefab": { - "__id__": 730 + "__id__": 731 }, "_contentSize": { "__type__": "cc.Size", @@ -14263,11 +14281,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 728 + "__id__": 729 }, "_enabled": true, "__prefab": { - "__id__": 732 + "__id__": 733 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14321,20 +14339,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 697 + "__id__": 698 }, "_children": [], "_active": true, "_components": [ { - "__id__": 735 + "__id__": 736 }, { - "__id__": 737 + "__id__": 738 } ], "_prefab": { - "__id__": 739 + "__id__": 740 }, "_lpos": { "__type__": "cc.Vec3", @@ -14371,11 +14389,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 734 + "__id__": 735 }, "_enabled": true, "__prefab": { - "__id__": 736 + "__id__": 737 }, "_contentSize": { "__type__": "cc.Size", @@ -14399,11 +14417,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 734 + "__id__": 735 }, "_enabled": true, "__prefab": { - "__id__": 738 + "__id__": 739 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14457,20 +14475,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 697 + "__id__": 698 }, "_children": [], "_active": true, "_components": [ { - "__id__": 741 + "__id__": 742 }, { - "__id__": 743 + "__id__": 744 } ], "_prefab": { - "__id__": 745 + "__id__": 746 }, "_lpos": { "__type__": "cc.Vec3", @@ -14507,11 +14525,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 740 + "__id__": 741 }, "_enabled": true, "__prefab": { - "__id__": 742 + "__id__": 743 }, "_contentSize": { "__type__": "cc.Size", @@ -14535,11 +14553,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 740 + "__id__": 741 }, "_enabled": true, "__prefab": { - "__id__": 744 + "__id__": 745 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14593,20 +14611,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 697 + "__id__": 698 }, "_children": [], "_active": true, "_components": [ { - "__id__": 747 + "__id__": 748 }, { - "__id__": 749 + "__id__": 750 } ], "_prefab": { - "__id__": 751 + "__id__": 752 }, "_lpos": { "__type__": "cc.Vec3", @@ -14643,11 +14661,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 746 + "__id__": 747 }, "_enabled": true, "__prefab": { - "__id__": 748 + "__id__": 749 }, "_contentSize": { "__type__": "cc.Size", @@ -14671,11 +14689,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 746 + "__id__": 747 }, "_enabled": true, "__prefab": { - "__id__": 750 + "__id__": 751 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14729,20 +14747,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 697 + "__id__": 698 }, "_children": [], "_active": true, "_components": [ { - "__id__": 753 + "__id__": 754 }, { - "__id__": 755 + "__id__": 756 } ], "_prefab": { - "__id__": 757 + "__id__": 758 }, "_lpos": { "__type__": "cc.Vec3", @@ -14779,11 +14797,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 752 + "__id__": 753 }, "_enabled": true, "__prefab": { - "__id__": 754 + "__id__": 755 }, "_contentSize": { "__type__": "cc.Size", @@ -14807,11 +14825,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 752 + "__id__": 753 }, "_enabled": true, "__prefab": { - "__id__": 756 + "__id__": 757 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14865,20 +14883,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 697 + "__id__": 698 }, "_children": [], "_active": true, "_components": [ { - "__id__": 759 + "__id__": 760 }, { - "__id__": 761 + "__id__": 762 } ], "_prefab": { - "__id__": 763 + "__id__": 764 }, "_lpos": { "__type__": "cc.Vec3", @@ -14915,11 +14933,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 758 + "__id__": 759 }, "_enabled": true, "__prefab": { - "__id__": 760 + "__id__": 761 }, "_contentSize": { "__type__": "cc.Size", @@ -14943,11 +14961,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 758 + "__id__": 759 }, "_enabled": true, "__prefab": { - "__id__": 762 + "__id__": 763 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15001,11 +15019,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 697 + "__id__": 698 }, "_enabled": true, "__prefab": { - "__id__": 765 + "__id__": 766 }, "_contentSize": { "__type__": "cc.Size", @@ -15029,11 +15047,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 697 + "__id__": 698 }, "_enabled": true, "__prefab": { - "__id__": 767 + "__id__": 768 }, "_type": 0, "_inverted": false, @@ -15051,11 +15069,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 697 + "__id__": 698 }, "_enabled": true, "__prefab": { - "__id__": 769 + "__id__": 770 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15097,11 +15115,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 697 + "__id__": 698 }, "_enabled": false, "__prefab": { - "__id__": 771 + "__id__": 772 }, "_resizeMode": 0, "_layoutType": 1, @@ -15154,14 +15172,14 @@ "_active": false, "_components": [ { - "__id__": 774 + "__id__": 775 }, { - "__id__": 776 + "__id__": 777 } ], "_prefab": { - "__id__": 778 + "__id__": 779 }, "_lpos": { "__type__": "cc.Vec3", @@ -15198,11 +15216,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 773 + "__id__": 774 }, "_enabled": true, "__prefab": { - "__id__": 775 + "__id__": 776 }, "_contentSize": { "__type__": "cc.Size", @@ -15226,11 +15244,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 773 + "__id__": 774 }, "_enabled": true, "__prefab": { - "__id__": 777 + "__id__": 778 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15290,11 +15308,11 @@ "_active": false, "_components": [ { - "__id__": 780 + "__id__": 781 } ], "_prefab": { - "__id__": 782 + "__id__": 783 }, "_lpos": { "__type__": "cc.Vec3", @@ -15331,11 +15349,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 779 + "__id__": 780 }, "_enabled": true, "__prefab": { - "__id__": 781 + "__id__": 782 }, "_contentSize": { "__type__": "cc.Size", @@ -15376,23 +15394,23 @@ }, "_children": [ { - "__id__": 784 + "__id__": 785 } ], "_active": false, "_components": [ { - "__id__": 790 + "__id__": 791 }, { - "__id__": 792 + "__id__": 793 }, { - "__id__": 794 + "__id__": 795 } ], "_prefab": { - "__id__": 796 + "__id__": 797 }, "_lpos": { "__type__": "cc.Vec3", @@ -15429,20 +15447,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 783 + "__id__": 784 }, "_children": [], "_active": true, "_components": [ { - "__id__": 785 + "__id__": 786 }, { - "__id__": 787 + "__id__": 788 } ], "_prefab": { - "__id__": 789 + "__id__": 790 }, "_lpos": { "__type__": "cc.Vec3", @@ -15479,11 +15497,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 784 + "__id__": 785 }, "_enabled": true, "__prefab": { - "__id__": 786 + "__id__": 787 }, "_contentSize": { "__type__": "cc.Size", @@ -15507,11 +15525,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 784 + "__id__": 785 }, "_enabled": true, "__prefab": { - "__id__": 788 + "__id__": 789 }, "_lineHeight": 40, "_string": "Rich", @@ -15558,11 +15576,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 783 + "__id__": 784 }, "_enabled": true, "__prefab": { - "__id__": 791 + "__id__": 792 }, "_contentSize": { "__type__": "cc.Size", @@ -15586,11 +15604,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 783 + "__id__": 784 }, "_enabled": true, "__prefab": { - "__id__": 793 + "__id__": 794 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15631,11 +15649,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 783 + "__id__": 784 }, "_enabled": true, "__prefab": { - "__id__": 795 + "__id__": 796 }, "_resizeMode": 1, "_layoutType": 1, @@ -15686,23 +15704,23 @@ }, "_children": [ { - "__id__": 798 + "__id__": 799 } ], "_active": false, "_components": [ { - "__id__": 818 + "__id__": 819 }, { - "__id__": 820 + "__id__": 821 }, { - "__id__": 822 + "__id__": 823 } ], "_prefab": { - "__id__": 824 + "__id__": 825 }, "_lpos": { "__type__": "cc.Vec3", @@ -15739,30 +15757,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 797 + "__id__": 798 }, "_children": [ { - "__id__": 799 + "__id__": 800 }, { - "__id__": 805 + "__id__": 806 } ], "_active": true, "_components": [ { - "__id__": 811 + "__id__": 812 }, { - "__id__": 813 + "__id__": 814 }, { - "__id__": 815 + "__id__": 816 } ], "_prefab": { - "__id__": 817 + "__id__": 818 }, "_lpos": { "__type__": "cc.Vec3", @@ -15799,20 +15817,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 798 + "__id__": 799 }, "_children": [], "_active": true, "_components": [ { - "__id__": 800 + "__id__": 801 }, { - "__id__": 802 + "__id__": 803 } ], "_prefab": { - "__id__": 804 + "__id__": 805 }, "_lpos": { "__type__": "cc.Vec3", @@ -15849,11 +15867,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 799 + "__id__": 800 }, "_enabled": true, "__prefab": { - "__id__": 801 + "__id__": 802 }, "_contentSize": { "__type__": "cc.Size", @@ -15877,11 +15895,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 799 + "__id__": 800 }, "_enabled": true, "__prefab": { - "__id__": 803 + "__id__": 804 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15958,20 +15976,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 798 + "__id__": 799 }, "_children": [], "_active": true, "_components": [ { - "__id__": 806 + "__id__": 807 }, { - "__id__": 808 + "__id__": 809 } ], "_prefab": { - "__id__": 810 + "__id__": 811 }, "_lpos": { "__type__": "cc.Vec3", @@ -16008,11 +16026,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 805 + "__id__": 806 }, "_enabled": true, "__prefab": { - "__id__": 807 + "__id__": 808 }, "_contentSize": { "__type__": "cc.Size", @@ -16036,11 +16054,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 805 + "__id__": 806 }, "_enabled": true, "__prefab": { - "__id__": 809 + "__id__": 810 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16117,11 +16135,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 798 + "__id__": 799 }, "_enabled": true, "__prefab": { - "__id__": 812 + "__id__": 813 }, "_contentSize": { "__type__": "cc.Size", @@ -16145,11 +16163,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 798 + "__id__": 799 }, "_enabled": true, "__prefab": { - "__id__": 814 + "__id__": 815 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16190,11 +16208,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 798 + "__id__": 799 }, "_enabled": true, "__prefab": { - "__id__": 816 + "__id__": 817 }, "_id": "" }, @@ -16221,11 +16239,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 797 + "__id__": 798 }, "_enabled": true, "__prefab": { - "__id__": 819 + "__id__": 820 }, "_contentSize": { "__type__": "cc.Size", @@ -16249,11 +16267,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 797 + "__id__": 798 }, "_enabled": true, "__prefab": { - "__id__": 821 + "__id__": 822 }, "_alignFlags": 45, "_target": null, @@ -16285,11 +16303,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 797 + "__id__": 798 }, "_enabled": true, "__prefab": { - "__id__": 823 + "__id__": 824 }, "_id": "" }, @@ -16320,23 +16338,23 @@ }, "_children": [ { - "__id__": 826 + "__id__": 827 } ], "_active": false, "_components": [ { - "__id__": 846 + "__id__": 847 }, { - "__id__": 848 + "__id__": 849 }, { - "__id__": 850 + "__id__": 851 } ], "_prefab": { - "__id__": 852 + "__id__": 853 }, "_lpos": { "__type__": "cc.Vec3", @@ -16373,30 +16391,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 825 + "__id__": 826 }, "_children": [ { - "__id__": 827 + "__id__": 828 }, { - "__id__": 833 + "__id__": 834 } ], "_active": true, "_components": [ { - "__id__": 839 + "__id__": 840 }, { - "__id__": 841 + "__id__": 842 }, { - "__id__": 843 + "__id__": 844 } ], "_prefab": { - "__id__": 845 + "__id__": 846 }, "_lpos": { "__type__": "cc.Vec3", @@ -16433,20 +16451,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 826 + "__id__": 827 }, "_children": [], "_active": true, "_components": [ { - "__id__": 828 + "__id__": 829 }, { - "__id__": 830 + "__id__": 831 } ], "_prefab": { - "__id__": 832 + "__id__": 833 }, "_lpos": { "__type__": "cc.Vec3", @@ -16483,11 +16501,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 827 + "__id__": 828 }, "_enabled": true, "__prefab": { - "__id__": 829 + "__id__": 830 }, "_contentSize": { "__type__": "cc.Size", @@ -16511,11 +16529,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 827 + "__id__": 828 }, "_enabled": true, "__prefab": { - "__id__": 831 + "__id__": 832 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16592,20 +16610,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 826 + "__id__": 827 }, "_children": [], "_active": true, "_components": [ { - "__id__": 834 + "__id__": 835 }, { - "__id__": 836 + "__id__": 837 } ], "_prefab": { - "__id__": 838 + "__id__": 839 }, "_lpos": { "__type__": "cc.Vec3", @@ -16642,11 +16660,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 833 + "__id__": 834 }, "_enabled": true, "__prefab": { - "__id__": 835 + "__id__": 836 }, "_contentSize": { "__type__": "cc.Size", @@ -16670,11 +16688,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 833 + "__id__": 834 }, "_enabled": true, "__prefab": { - "__id__": 837 + "__id__": 838 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16751,11 +16769,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 826 + "__id__": 827 }, "_enabled": true, "__prefab": { - "__id__": 840 + "__id__": 841 }, "_contentSize": { "__type__": "cc.Size", @@ -16779,11 +16797,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 826 + "__id__": 827 }, "_enabled": true, "__prefab": { - "__id__": 842 + "__id__": 843 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16824,11 +16842,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 826 + "__id__": 827 }, "_enabled": true, "__prefab": { - "__id__": 844 + "__id__": 845 }, "_id": "" }, @@ -16855,11 +16873,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 825 + "__id__": 826 }, "_enabled": true, "__prefab": { - "__id__": 847 + "__id__": 848 }, "_contentSize": { "__type__": "cc.Size", @@ -16883,11 +16901,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 825 + "__id__": 826 }, "_enabled": true, "__prefab": { - "__id__": 849 + "__id__": 850 }, "_alignFlags": 45, "_target": null, @@ -16919,11 +16937,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 825 + "__id__": 826 }, "_enabled": true, "__prefab": { - "__id__": 851 + "__id__": 852 }, "_id": "" }, @@ -16954,23 +16972,23 @@ }, "_children": [ { - "__id__": 854 + "__id__": 855 } ], "_active": false, "_components": [ { - "__id__": 874 + "__id__": 879 }, { - "__id__": 876 + "__id__": 881 }, { - "__id__": 878 + "__id__": 883 } ], "_prefab": { - "__id__": 880 + "__id__": 885 }, "_lpos": { "__type__": "cc.Vec3", @@ -17007,30 +17025,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 853 + "__id__": 854 }, "_children": [ { - "__id__": 855 + "__id__": 856 }, { - "__id__": 861 + "__id__": 862 + }, + { + "__id__": 868 } ], "_active": true, "_components": [ { - "__id__": 867 - }, - { - "__id__": 869 + "__id__": 874 }, { - "__id__": 871 + "__id__": 876 } ], "_prefab": { - "__id__": 873 + "__id__": 878 }, "_lpos": { "__type__": "cc.Vec3", @@ -17063,28 +17081,164 @@ }, { "__type__": "cc.Node", - "_name": "name", + "_name": "敌方信息框", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 854 + "__id__": 855 }, "_children": [], "_active": true, "_components": [ { - "__id__": 856 + "__id__": 857 }, { - "__id__": 858 + "__id__": 859 } ], "_prefab": { + "__id__": 861 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 239.454, + "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__": 856 + }, + "_enabled": true, + "__prefab": { + "__id__": 858 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 262, + "height": 202 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.05, + "y": 1 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "06TvZHTwtMr5ZVFqc3x23s" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 856 + }, + "_enabled": true, + "__prefab": { "__id__": 860 }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "a0ccfac3-a7c7-4ff0-8d59-490bcac7c80d@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": "c6P036kkNP5b7rJSO4icB/" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "3aZNR0OLpP6oaSbdoKtaf7", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "name", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 855 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 863 + }, + { + "__id__": 865 + } + ], + "_prefab": { + "__id__": 867 + }, "_lpos": { "__type__": "cc.Vec3", - "x": -120, + "x": 119.261, "y": -68, "z": 0 }, @@ -17117,11 +17271,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 855 + "__id__": 862 }, "_enabled": true, "__prefab": { - "__id__": 857 + "__id__": 864 }, "_contentSize": { "__type__": "cc.Size", @@ -17145,11 +17299,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 855 + "__id__": 862 }, "_enabled": true, "__prefab": { - "__id__": 859 + "__id__": 866 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17226,24 +17380,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 854 + "__id__": 855 }, "_children": [], "_active": true, "_components": [ { - "__id__": 862 + "__id__": 869 }, { - "__id__": 864 + "__id__": 871 } ], "_prefab": { - "__id__": 866 + "__id__": 873 }, "_lpos": { "__type__": "cc.Vec3", - "x": -120, + "x": 119.261, "y": -95, "z": 0 }, @@ -17276,11 +17430,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 861 + "__id__": 868 }, "_enabled": true, "__prefab": { - "__id__": 863 + "__id__": 870 }, "_contentSize": { "__type__": "cc.Size", @@ -17304,11 +17458,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 861 + "__id__": 868 }, "_enabled": true, "__prefab": { - "__id__": 865 + "__id__": 872 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17385,11 +17539,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 854 + "__id__": 855 }, "_enabled": true, "__prefab": { - "__id__": 868 + "__id__": 875 }, "_contentSize": { "__type__": "cc.Size", @@ -17398,7 +17552,7 @@ }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.95, + "x": 0.05, "y": 1 }, "_id": "" @@ -17407,62 +17561,17 @@ "__type__": "cc.CompPrefabInfo", "fileId": "bcdpeiYcFCE5ni8aywcAhO" }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 854 - }, - "_enabled": true, - "__prefab": { - "__id__": 870 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "a0ccfac3-a7c7-4ff0-8d59-490bcac7c80d@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": "87giqHSR1Jg5pmsHykxxWn" - }, { "__type__": "cc.BlockInputEvents", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 854 + "__id__": 855 }, "_enabled": true, "__prefab": { - "__id__": 872 + "__id__": 877 }, "_id": "" }, @@ -17489,11 +17598,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 853 + "__id__": 854 }, "_enabled": true, "__prefab": { - "__id__": 875 + "__id__": 880 }, "_contentSize": { "__type__": "cc.Size", @@ -17517,11 +17626,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 853 + "__id__": 854 }, "_enabled": true, "__prefab": { - "__id__": 877 + "__id__": 882 }, "_alignFlags": 45, "_target": null, @@ -17553,11 +17662,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 853 + "__id__": 854 }, "_enabled": true, "__prefab": { - "__id__": 879 + "__id__": 884 }, "_id": "" }, @@ -17588,23 +17697,23 @@ }, "_children": [ { - "__id__": 882 + "__id__": 887 }, { - "__id__": 888 + "__id__": 893 }, { - "__id__": 904 + "__id__": 909 } ], "_active": false, "_components": [ { - "__id__": 910 + "__id__": 915 } ], "_prefab": { - "__id__": 912 + "__id__": 917 }, "_lpos": { "__type__": "cc.Vec3", @@ -17641,20 +17750,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 881 + "__id__": 886 }, "_children": [], "_active": true, "_components": [ { - "__id__": 883 + "__id__": 888 }, { - "__id__": 885 + "__id__": 890 } ], "_prefab": { - "__id__": 887 + "__id__": 892 }, "_lpos": { "__type__": "cc.Vec3", @@ -17691,11 +17800,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 882 + "__id__": 887 }, "_enabled": true, "__prefab": { - "__id__": 884 + "__id__": 889 }, "_contentSize": { "__type__": "cc.Size", @@ -17719,11 +17828,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 882 + "__id__": 887 }, "_enabled": true, "__prefab": { - "__id__": 886 + "__id__": 891 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17777,24 +17886,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 881 + "__id__": 886 }, "_children": [ { - "__id__": 889 + "__id__": 894 }, { - "__id__": 895 + "__id__": 900 } ], "_active": true, "_components": [ { - "__id__": 901 + "__id__": 906 } ], "_prefab": { - "__id__": 903 + "__id__": 908 }, "_lpos": { "__type__": "cc.Vec3", @@ -17831,20 +17940,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 888 + "__id__": 893 }, "_children": [], "_active": true, "_components": [ { - "__id__": 890 + "__id__": 895 }, { - "__id__": 892 + "__id__": 897 } ], "_prefab": { - "__id__": 894 + "__id__": 899 }, "_lpos": { "__type__": "cc.Vec3", @@ -17881,11 +17990,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 889 + "__id__": 894 }, "_enabled": true, "__prefab": { - "__id__": 891 + "__id__": 896 }, "_contentSize": { "__type__": "cc.Size", @@ -17909,11 +18018,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 889 + "__id__": 894 }, "_enabled": true, "__prefab": { - "__id__": 893 + "__id__": 898 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17967,20 +18076,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 888 + "__id__": 893 }, "_children": [], "_active": false, "_components": [ { - "__id__": 896 + "__id__": 901 }, { - "__id__": 898 + "__id__": 903 } ], "_prefab": { - "__id__": 900 + "__id__": 905 }, "_lpos": { "__type__": "cc.Vec3", @@ -18017,11 +18126,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 895 + "__id__": 900 }, "_enabled": true, "__prefab": { - "__id__": 897 + "__id__": 902 }, "_contentSize": { "__type__": "cc.Size", @@ -18045,11 +18154,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 895 + "__id__": 900 }, "_enabled": true, "__prefab": { - "__id__": 899 + "__id__": 904 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18103,11 +18212,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 888 + "__id__": 893 }, "_enabled": true, "__prefab": { - "__id__": 902 + "__id__": 907 }, "_contentSize": { "__type__": "cc.Size", @@ -18144,20 +18253,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 881 + "__id__": 886 }, "_children": [], "_active": true, "_components": [ { - "__id__": 905 + "__id__": 910 }, { - "__id__": 907 + "__id__": 912 } ], "_prefab": { - "__id__": 909 + "__id__": 914 }, "_lpos": { "__type__": "cc.Vec3", @@ -18194,11 +18303,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 904 + "__id__": 909 }, "_enabled": true, "__prefab": { - "__id__": 906 + "__id__": 911 }, "_contentSize": { "__type__": "cc.Size", @@ -18222,11 +18331,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 904 + "__id__": 909 }, "_enabled": true, "__prefab": { - "__id__": 908 + "__id__": 913 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18280,11 +18389,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 881 + "__id__": 886 }, "_enabled": true, "__prefab": { - "__id__": 911 + "__id__": 916 }, "_contentSize": { "__type__": "cc.Size", @@ -18325,7 +18434,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 914 + "__id__": 919 }, "_contentSize": { "__type__": "cc.Size", @@ -18353,7 +18462,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 916 + "__id__": 921 }, "_alignFlags": 45, "_target": null, @@ -18389,7 +18498,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 918 + "__id__": 923 }, "_id": "" }, @@ -18407,7 +18516,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 920 + "__id__": 925 }, "_type": 0, "_inverted": false, @@ -18429,7 +18538,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 922 + "__id__": 927 }, "_id": "" }, @@ -18447,7 +18556,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 924 + "__id__": 929 }, "_customMaterial": null, "_srcBlendFactor": 2, diff --git a/assets/bundles/icons/shopSkill/七十二变.png b/assets/bundles/icons/shopSkill/七十二变.png deleted file mode 100644 index b2f2ae0..0000000 Binary files a/assets/bundles/icons/shopSkill/七十二变.png and /dev/null differ diff --git a/assets/bundles/icons/shopSkill/七十二变.png.meta b/assets/bundles/icons/shopSkill/七十二变.png.meta deleted file mode 100644 index 9943130..0000000 --- a/assets/bundles/icons/shopSkill/七十二变.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "c948735a-7ac2-4c46-8628-01015f6833ad", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "c948735a-7ac2-4c46-8628-01015f6833ad@6c48a", - "displayName": "七十二变", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "c948735a-7ac2-4c46-8628-01015f6833ad", - "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": "c948735a-7ac2-4c46-8628-01015f6833ad@f9941", - "displayName": "七十二变", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": -0.5, - "offsetY": 0.5, - "trimX": 54, - "trimY": 35, - "width": 91, - "height": 129, - "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": [ - -45.5, - -64.5, - 0, - 45.5, - -64.5, - 0, - -45.5, - 64.5, - 0, - 45.5, - 64.5, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 54, - 165, - 145, - 165, - 54, - 36, - 145, - 36 - ], - "nuv": [ - 0.27, - 0.18, - 0.725, - 0.18, - 0.27, - 0.825, - 0.725, - 0.825 - ], - "minPos": [ - -45.5, - -64.5, - 0 - ], - "maxPos": [ - 45.5, - 64.5, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "c948735a-7ac2-4c46-8628-01015f6833ad@6c48a", - "atlasUuid": "", - "trimType": "auto" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "hasAlpha": true, - "redirect": "c948735a-7ac2-4c46-8628-01015f6833ad@6c48a" - } -} diff --git a/assets/bundles/icons/shopSkill/万神幡.png b/assets/bundles/icons/shopSkill/万神幡.png deleted file mode 100644 index b3d973a..0000000 Binary files a/assets/bundles/icons/shopSkill/万神幡.png and /dev/null differ diff --git a/assets/bundles/icons/shopSkill/万神幡.png.meta b/assets/bundles/icons/shopSkill/万神幡.png.meta deleted file mode 100644 index bb32e62..0000000 --- a/assets/bundles/icons/shopSkill/万神幡.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "5f87cc35-d765-484b-b670-60cbb4349c44", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "5f87cc35-d765-484b-b670-60cbb4349c44@6c48a", - "displayName": "万神幡", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "5f87cc35-d765-484b-b670-60cbb4349c44", - "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": "5f87cc35-d765-484b-b670-60cbb4349c44@f9941", - "displayName": "万神幡", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0.5, - "trimX": 30, - "trimY": 16, - "width": 140, - "height": 167, - "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": [ - -70, - -83.5, - 0, - 70, - -83.5, - 0, - -70, - 83.5, - 0, - 70, - 83.5, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 30, - 184, - 170, - 184, - 30, - 17, - 170, - 17 - ], - "nuv": [ - 0.15, - 0.085, - 0.85, - 0.085, - 0.15, - 0.92, - 0.85, - 0.92 - ], - "minPos": [ - -70, - -83.5, - 0 - ], - "maxPos": [ - 70, - 83.5, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "5f87cc35-d765-484b-b670-60cbb4349c44@6c48a", - "atlasUuid": "", - "trimType": "auto" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "hasAlpha": true, - "redirect": "5f87cc35-d765-484b-b670-60cbb4349c44@6c48a" - } -} diff --git a/assets/bundles/icons/shopSkill/三昧真火.png b/assets/bundles/icons/shopSkill/三昧真火.png deleted file mode 100644 index bc8edd4..0000000 Binary files a/assets/bundles/icons/shopSkill/三昧真火.png and /dev/null differ diff --git a/assets/bundles/icons/shopSkill/三昧真火.png.meta b/assets/bundles/icons/shopSkill/三昧真火.png.meta deleted file mode 100644 index df4fde0..0000000 --- a/assets/bundles/icons/shopSkill/三昧真火.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "d81e4308-417b-49cc-80eb-8124963bb6a0", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "d81e4308-417b-49cc-80eb-8124963bb6a0@6c48a", - "displayName": "三昧真火", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "d81e4308-417b-49cc-80eb-8124963bb6a0", - "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": "d81e4308-417b-49cc-80eb-8124963bb6a0@f9941", - "displayName": "三昧真火", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": -0.5, - "offsetY": 0, - "trimX": 44, - "trimY": 35, - "width": 111, - "height": 130, - "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": [ - -55.5, - -65, - 0, - 55.5, - -65, - 0, - -55.5, - 65, - 0, - 55.5, - 65, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 44, - 165, - 155, - 165, - 44, - 35, - 155, - 35 - ], - "nuv": [ - 0.22, - 0.175, - 0.775, - 0.175, - 0.22, - 0.825, - 0.775, - 0.825 - ], - "minPos": [ - -55.5, - -65, - 0 - ], - "maxPos": [ - 55.5, - 65, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "d81e4308-417b-49cc-80eb-8124963bb6a0@6c48a", - "atlasUuid": "", - "trimType": "auto" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "hasAlpha": true, - "redirect": "d81e4308-417b-49cc-80eb-8124963bb6a0@6c48a" - } -} diff --git a/assets/bundles/icons/shopSkill/封神榜.png b/assets/bundles/icons/shopSkill/倍增卡.png similarity index 100% rename from assets/bundles/icons/shopSkill/封神榜.png rename to assets/bundles/icons/shopSkill/倍增卡.png diff --git a/assets/bundles/icons/shopSkill/封神榜.png.meta b/assets/bundles/icons/shopSkill/倍增卡.png.meta similarity index 97% rename from assets/bundles/icons/shopSkill/封神榜.png.meta rename to assets/bundles/icons/shopSkill/倍增卡.png.meta index ac8e6cd..676169f 100644 --- a/assets/bundles/icons/shopSkill/封神榜.png.meta +++ b/assets/bundles/icons/shopSkill/倍增卡.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "e3df0222-eaa9-473c-afef-d5c9ee5ad22b@6c48a", - "displayName": "封神榜", + "displayName": "倍增卡", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "e3df0222-eaa9-473c-afef-d5c9ee5ad22b@f9941", - "displayName": "封神榜", + "displayName": "倍增卡", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/bundles/icons/shopSkill/营.png b/assets/bundles/icons/shopSkill/倍率卡.png similarity index 100% rename from assets/bundles/icons/shopSkill/营.png rename to assets/bundles/icons/shopSkill/倍率卡.png diff --git a/assets/bundles/icons/shopSkill/营.png.meta b/assets/bundles/icons/shopSkill/倍率卡.png.meta similarity index 97% rename from assets/bundles/icons/shopSkill/营.png.meta rename to assets/bundles/icons/shopSkill/倍率卡.png.meta index b04601c..de8a6d3 100644 --- a/assets/bundles/icons/shopSkill/营.png.meta +++ b/assets/bundles/icons/shopSkill/倍率卡.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "acaf22a0-cc3e-4995-a77d-6b31aeb38836@6c48a", - "displayName": "营", + "displayName": "倍率卡", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "acaf22a0-cc3e-4995-a77d-6b31aeb38836@f9941", - "displayName": "营", + "displayName": "倍率卡", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/bundles/icons/shopSkill/化龙铲.png b/assets/bundles/icons/shopSkill/化龙铲.png deleted file mode 100644 index 3e98253..0000000 Binary files a/assets/bundles/icons/shopSkill/化龙铲.png and /dev/null differ diff --git a/assets/bundles/icons/shopSkill/千里眼.png b/assets/bundles/icons/shopSkill/双生盾.png similarity index 100% rename from assets/bundles/icons/shopSkill/千里眼.png rename to assets/bundles/icons/shopSkill/双生盾.png diff --git a/assets/bundles/icons/shopSkill/千里眼.png.meta b/assets/bundles/icons/shopSkill/双生盾.png.meta similarity index 97% rename from assets/bundles/icons/shopSkill/千里眼.png.meta rename to assets/bundles/icons/shopSkill/双生盾.png.meta index d7665e4..3524be8 100644 --- a/assets/bundles/icons/shopSkill/千里眼.png.meta +++ b/assets/bundles/icons/shopSkill/双生盾.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "2edda2b5-9431-4a49-98c0-ba94ad4c67d6@6c48a", - "displayName": "千里眼", + "displayName": "双生盾", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "2edda2b5-9431-4a49-98c0-ba94ad4c67d6@f9941", - "displayName": "千里眼", + "displayName": "双生盾", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/bundles/icons/shopSkill/妙手神偷.png b/assets/bundles/icons/shopSkill/妙手神偷.png deleted file mode 100644 index fb06e74..0000000 Binary files a/assets/bundles/icons/shopSkill/妙手神偷.png and /dev/null differ diff --git a/assets/bundles/icons/shopSkill/妙手神偷.png.meta b/assets/bundles/icons/shopSkill/妙手神偷.png.meta deleted file mode 100644 index b36f040..0000000 --- a/assets/bundles/icons/shopSkill/妙手神偷.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "7925542c-fd24-409c-8ad5-4e6ff4ca2396", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "7925542c-fd24-409c-8ad5-4e6ff4ca2396@6c48a", - "displayName": "妙手神偷", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "7925542c-fd24-409c-8ad5-4e6ff4ca2396", - "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": "7925542c-fd24-409c-8ad5-4e6ff4ca2396@f9941", - "displayName": "妙手神偷", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 31, - "trimY": 23, - "width": 138, - "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": [ - -69, - -77, - 0, - 69, - -77, - 0, - -69, - 77, - 0, - 69, - 77, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 31, - 177, - 169, - 177, - 31, - 23, - 169, - 23 - ], - "nuv": [ - 0.155, - 0.115, - 0.845, - 0.115, - 0.155, - 0.885, - 0.845, - 0.885 - ], - "minPos": [ - -69, - -77, - 0 - ], - "maxPos": [ - 69, - 77, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "7925542c-fd24-409c-8ad5-4e6ff4ca2396@6c48a", - "atlasUuid": "", - "trimType": "auto" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "hasAlpha": true, - "redirect": "7925542c-fd24-409c-8ad5-4e6ff4ca2396@6c48a" - } -} diff --git a/assets/bundles/icons/shopSkill/云麾号角.png b/assets/bundles/icons/shopSkill/寻金尺.png similarity index 100% rename from assets/bundles/icons/shopSkill/云麾号角.png rename to assets/bundles/icons/shopSkill/寻金尺.png diff --git a/assets/bundles/icons/shopSkill/化龙铲.png.meta b/assets/bundles/icons/shopSkill/寻金尺.png.meta similarity index 64% rename from assets/bundles/icons/shopSkill/化龙铲.png.meta rename to assets/bundles/icons/shopSkill/寻金尺.png.meta index cffc61f..f7a342f 100644 --- a/assets/bundles/icons/shopSkill/化龙铲.png.meta +++ b/assets/bundles/icons/shopSkill/寻金尺.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "d51a7b3c-769b-4393-9c73-68c105de7c09", + "uuid": "2d5a11fb-3070-4b1b-adf4-27d1313d75f9", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "d51a7b3c-769b-4393-9c73-68c105de7c09@6c48a", - "displayName": "化龙铲", + "uuid": "2d5a11fb-3070-4b1b-adf4-27d1313d75f9@6c48a", + "displayName": "寻金尺", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "d51a7b3c-769b-4393-9c73-68c105de7c09", + "imageUuidOrDatabaseUri": "2d5a11fb-3070-4b1b-adf4-27d1313d75f9", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,19 +34,19 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "d51a7b3c-769b-4393-9c73-68c105de7c09@f9941", - "displayName": "化龙铲", + "uuid": "2d5a11fb-3070-4b1b-adf4-27d1313d75f9@f9941", + "displayName": "寻金尺", "id": "f9941", "name": "spriteFrame", "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": -0.5, + "offsetX": 0, "offsetY": 0.5, - "trimX": 32, - "trimY": 24, - "width": 135, - "height": 151, + "trimX": 19, + "trimY": 33, + "width": 162, + "height": 133, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -67.5, - -75.5, + -81, + -66.5, 0, - 67.5, - -75.5, + 81, + -66.5, 0, - -67.5, - 75.5, + -81, + 66.5, 0, - 67.5, - 75.5, + 81, + 66.5, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 32, - 176, + 19, 167, - 176, - 32, - 25, + 181, 167, - 25 + 19, + 34, + 181, + 34 ], "nuv": [ - 0.16, - 0.125, + 0.095, + 0.17, + 0.905, + 0.17, + 0.095, 0.835, - 0.125, - 0.16, - 0.88, - 0.835, - 0.88 + 0.905, + 0.835 ], "minPos": [ - -67.5, - -75.5, + -81, + -66.5, 0 ], "maxPos": [ - 67.5, - 75.5, + 81, + 66.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "d51a7b3c-769b-4393-9c73-68c105de7c09@6c48a", + "imageUuidOrDatabaseUri": "2d5a11fb-3070-4b1b-adf4-27d1313d75f9@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "d51a7b3c-769b-4393-9c73-68c105de7c09@6c48a" + "redirect": "2d5a11fb-3070-4b1b-adf4-27d1313d75f9@6c48a" } } diff --git a/assets/bundles/icons/shopSkill/授仙箓.png b/assets/bundles/icons/shopSkill/属性卡.png similarity index 100% rename from assets/bundles/icons/shopSkill/授仙箓.png rename to assets/bundles/icons/shopSkill/属性卡.png diff --git a/assets/bundles/icons/shopSkill/授仙箓.png.meta b/assets/bundles/icons/shopSkill/属性卡.png.meta similarity index 97% rename from assets/bundles/icons/shopSkill/授仙箓.png.meta rename to assets/bundles/icons/shopSkill/属性卡.png.meta index 868166d..1a363d4 100644 --- a/assets/bundles/icons/shopSkill/授仙箓.png.meta +++ b/assets/bundles/icons/shopSkill/属性卡.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "bef1c144-15d4-4488-9791-20c30004185c@6c48a", - "displayName": "授仙箓", + "displayName": "属性卡", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "bef1c144-15d4-4488-9791-20c30004185c@f9941", - "displayName": "授仙箓", + "displayName": "属性卡", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/bundles/icons/shopSkill/人参果.png b/assets/bundles/icons/shopSkill/幸运石.png similarity index 100% rename from assets/bundles/icons/shopSkill/人参果.png rename to assets/bundles/icons/shopSkill/幸运石.png diff --git a/assets/bundles/icons/shopSkill/人参果.png.meta b/assets/bundles/icons/shopSkill/幸运石.png.meta similarity index 97% rename from assets/bundles/icons/shopSkill/人参果.png.meta rename to assets/bundles/icons/shopSkill/幸运石.png.meta index cf92135..add6525 100644 --- a/assets/bundles/icons/shopSkill/人参果.png.meta +++ b/assets/bundles/icons/shopSkill/幸运石.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "65feda06-32db-4475-84de-79b658042742@6c48a", - "displayName": "人参果", + "displayName": "幸运石", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "65feda06-32db-4475-84de-79b658042742@f9941", - "displayName": "人参果", + "displayName": "幸运石", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/bundles/icons/shopSkill/幻魂镜.png b/assets/bundles/icons/shopSkill/幻魂镜.png deleted file mode 100644 index fc909ba..0000000 Binary files a/assets/bundles/icons/shopSkill/幻魂镜.png and /dev/null differ diff --git a/assets/bundles/icons/shopSkill/幻魂镜.png.meta b/assets/bundles/icons/shopSkill/幻魂镜.png.meta deleted file mode 100644 index f08489c..0000000 --- a/assets/bundles/icons/shopSkill/幻魂镜.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "2ac5c886-efda-43dd-af6d-aadb179196d6", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "2ac5c886-efda-43dd-af6d-aadb179196d6@6c48a", - "displayName": "幻魂镜", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "2ac5c886-efda-43dd-af6d-aadb179196d6", - "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": "2ac5c886-efda-43dd-af6d-aadb179196d6@f9941", - "displayName": "幻魂镜", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 45, - "trimY": 18, - "width": 110, - "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": [ - -55, - -82, - 0, - 55, - -82, - 0, - -55, - 82, - 0, - 55, - 82, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 45, - 182, - 155, - 182, - 45, - 18, - 155, - 18 - ], - "nuv": [ - 0.225, - 0.09, - 0.775, - 0.09, - 0.225, - 0.91, - 0.775, - 0.91 - ], - "minPos": [ - -55, - -82, - 0 - ], - "maxPos": [ - 55, - 82, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "2ac5c886-efda-43dd-af6d-aadb179196d6@6c48a", - "atlasUuid": "", - "trimType": "auto" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "hasAlpha": true, - "redirect": "2ac5c886-efda-43dd-af6d-aadb179196d6@6c48a" - } -} diff --git a/assets/bundles/icons/shopSkill/九霄神雷.png b/assets/bundles/icons/shopSkill/御雷珠.png similarity index 100% rename from assets/bundles/icons/shopSkill/九霄神雷.png rename to assets/bundles/icons/shopSkill/御雷珠.png diff --git a/assets/bundles/icons/shopSkill/九霄神雷.png.meta b/assets/bundles/icons/shopSkill/御雷珠.png.meta similarity index 97% rename from assets/bundles/icons/shopSkill/九霄神雷.png.meta rename to assets/bundles/icons/shopSkill/御雷珠.png.meta index b27b60f..89f2ca0 100644 --- a/assets/bundles/icons/shopSkill/九霄神雷.png.meta +++ b/assets/bundles/icons/shopSkill/御雷珠.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "2f3882c8-5a0a-40d9-ad9b-b8c0db6cc2b5@6c48a", - "displayName": "九霄神雷", + "displayName": "御雷珠", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "2f3882c8-5a0a-40d9-ad9b-b8c0db6cc2b5@f9941", - "displayName": "九霄神雷", + "displayName": "御雷珠", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/bundles/icons/shopSkill/掘宝仙铲.png b/assets/bundles/icons/shopSkill/掘宝仙铲.png deleted file mode 100644 index 825a141..0000000 Binary files a/assets/bundles/icons/shopSkill/掘宝仙铲.png and /dev/null differ diff --git a/assets/bundles/icons/shopSkill/掘宝仙铲.png.meta b/assets/bundles/icons/shopSkill/掘宝仙铲.png.meta deleted file mode 100644 index 4c2c762..0000000 --- a/assets/bundles/icons/shopSkill/掘宝仙铲.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "3e1a78ea-940b-4f10-ac58-2cef7dde3bb4", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "3e1a78ea-940b-4f10-ac58-2cef7dde3bb4@6c48a", - "displayName": "掘宝仙铲", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "3e1a78ea-940b-4f10-ac58-2cef7dde3bb4", - "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": "3e1a78ea-940b-4f10-ac58-2cef7dde3bb4@f9941", - "displayName": "掘宝仙铲", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 23, - "trimY": 25, - "width": 154, - "height": 150, - "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, - -75, - 0, - 77, - -75, - 0, - -77, - 75, - 0, - 77, - 75, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 23, - 175, - 177, - 175, - 23, - 25, - 177, - 25 - ], - "nuv": [ - 0.115, - 0.125, - 0.885, - 0.125, - 0.115, - 0.875, - 0.885, - 0.875 - ], - "minPos": [ - -77, - -75, - 0 - ], - "maxPos": [ - 77, - 75, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "3e1a78ea-940b-4f10-ac58-2cef7dde3bb4@6c48a", - "atlasUuid": "", - "trimType": "auto" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "hasAlpha": true, - "redirect": "3e1a78ea-940b-4f10-ac58-2cef7dde3bb4@6c48a" - } -} diff --git a/assets/bundles/icons/shopSkill/文昌笔.png b/assets/bundles/icons/shopSkill/文昌笔.png deleted file mode 100644 index 5f75760..0000000 Binary files a/assets/bundles/icons/shopSkill/文昌笔.png and /dev/null differ diff --git a/assets/bundles/icons/shopSkill/文昌笔.png.meta b/assets/bundles/icons/shopSkill/文昌笔.png.meta deleted file mode 100644 index 27841fd..0000000 --- a/assets/bundles/icons/shopSkill/文昌笔.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "843e54d1-253b-440f-a38f-ba6073776b2a", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "843e54d1-253b-440f-a38f-ba6073776b2a@6c48a", - "displayName": "文昌笔", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "843e54d1-253b-440f-a38f-ba6073776b2a", - "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": "843e54d1-253b-440f-a38f-ba6073776b2a@f9941", - "displayName": "文昌笔", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0.5, - "trimX": 57, - "trimY": 30, - "width": 86, - "height": 139, - "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": [ - -43, - -69.5, - 0, - 43, - -69.5, - 0, - -43, - 69.5, - 0, - 43, - 69.5, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 57, - 170, - 143, - 170, - 57, - 31, - 143, - 31 - ], - "nuv": [ - 0.285, - 0.155, - 0.715, - 0.155, - 0.285, - 0.85, - 0.715, - 0.85 - ], - "minPos": [ - -43, - -69.5, - 0 - ], - "maxPos": [ - 43, - 69.5, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "843e54d1-253b-440f-a38f-ba6073776b2a@6c48a", - "atlasUuid": "", - "trimType": "auto" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "hasAlpha": true, - "redirect": "843e54d1-253b-440f-a38f-ba6073776b2a@6c48a" - } -} diff --git a/assets/bundles/icons/shopSkill/文财神.png b/assets/bundles/icons/shopSkill/文财神.png deleted file mode 100644 index ef7149b..0000000 Binary files a/assets/bundles/icons/shopSkill/文财神.png and /dev/null differ diff --git a/assets/bundles/icons/shopSkill/文财神.png.meta b/assets/bundles/icons/shopSkill/文财神.png.meta deleted file mode 100644 index 41e931c..0000000 --- a/assets/bundles/icons/shopSkill/文财神.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "0d11a061-2428-408c-8bf2-8a789f0db055", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "0d11a061-2428-408c-8bf2-8a789f0db055@6c48a", - "displayName": "文财神", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "0d11a061-2428-408c-8bf2-8a789f0db055", - "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": "0d11a061-2428-408c-8bf2-8a789f0db055@f9941", - "displayName": "文财神", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 25, - "trimY": 28, - "width": 150, - "height": 144, - "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": [ - -75, - -72, - 0, - 75, - -72, - 0, - -75, - 72, - 0, - 75, - 72, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 25, - 172, - 175, - 172, - 25, - 28, - 175, - 28 - ], - "nuv": [ - 0.125, - 0.14, - 0.875, - 0.14, - 0.125, - 0.86, - 0.875, - 0.86 - ], - "minPos": [ - -75, - -72, - 0 - ], - "maxPos": [ - 75, - 72, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "0d11a061-2428-408c-8bf2-8a789f0db055@6c48a", - "atlasUuid": "", - "trimType": "auto" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "hasAlpha": true, - "redirect": "0d11a061-2428-408c-8bf2-8a789f0db055@6c48a" - } -} diff --git a/assets/bundles/icons/shopSkill/武财神.png b/assets/bundles/icons/shopSkill/武财神.png deleted file mode 100644 index f747ca8..0000000 Binary files a/assets/bundles/icons/shopSkill/武财神.png and /dev/null differ diff --git a/assets/bundles/icons/shopSkill/武财神.png.meta b/assets/bundles/icons/shopSkill/武财神.png.meta deleted file mode 100644 index 2aabe8e..0000000 --- a/assets/bundles/icons/shopSkill/武财神.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "62f4d377-26bc-418f-b5b0-1ffbcea4cd12", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "62f4d377-26bc-418f-b5b0-1ffbcea4cd12@6c48a", - "displayName": "武财神", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "62f4d377-26bc-418f-b5b0-1ffbcea4cd12", - "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": "62f4d377-26bc-418f-b5b0-1ffbcea4cd12@f9941", - "displayName": "武财神", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 29, - "trimY": 29, - "width": 142, - "height": 142, - "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": [ - -71, - -71, - 0, - 71, - -71, - 0, - -71, - 71, - 0, - 71, - 71, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 29, - 171, - 171, - 171, - 29, - 29, - 171, - 29 - ], - "nuv": [ - 0.145, - 0.145, - 0.855, - 0.145, - 0.145, - 0.855, - 0.855, - 0.855 - ], - "minPos": [ - -71, - -71, - 0 - ], - "maxPos": [ - 71, - 71, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "62f4d377-26bc-418f-b5b0-1ffbcea4cd12@6c48a", - "atlasUuid": "", - "trimType": "auto" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "hasAlpha": true, - "redirect": "62f4d377-26bc-418f-b5b0-1ffbcea4cd12@6c48a" - } -} diff --git a/assets/bundles/icons/shopSkill/补元丹.png b/assets/bundles/icons/shopSkill/气血丸.png similarity index 100% rename from assets/bundles/icons/shopSkill/补元丹.png rename to assets/bundles/icons/shopSkill/气血丸.png diff --git a/assets/bundles/icons/shopSkill/补元丹.png.meta b/assets/bundles/icons/shopSkill/气血丸.png.meta similarity index 97% rename from assets/bundles/icons/shopSkill/补元丹.png.meta rename to assets/bundles/icons/shopSkill/气血丸.png.meta index 70b103d..fc9052b 100644 --- a/assets/bundles/icons/shopSkill/补元丹.png.meta +++ b/assets/bundles/icons/shopSkill/气血丸.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "a6f0cf48-c378-4c13-9910-7fc7143fefe5@6c48a", - "displayName": "补元丹", + "displayName": "气血丸", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "a6f0cf48-c378-4c13-9910-7fc7143fefe5@f9941", - "displayName": "补元丹", + "displayName": "气血丸", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/bundles/icons/shopSkill/召神令.png b/assets/bundles/icons/shopSkill/滞行牌.png similarity index 100% rename from assets/bundles/icons/shopSkill/召神令.png rename to assets/bundles/icons/shopSkill/滞行牌.png diff --git a/assets/bundles/icons/shopSkill/召神令.png.meta b/assets/bundles/icons/shopSkill/滞行牌.png.meta similarity index 97% rename from assets/bundles/icons/shopSkill/召神令.png.meta rename to assets/bundles/icons/shopSkill/滞行牌.png.meta index b25d442..4a58a7d 100644 --- a/assets/bundles/icons/shopSkill/召神令.png.meta +++ b/assets/bundles/icons/shopSkill/滞行牌.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "7a37ff08-cd20-465b-8fd6-3df3c21050cc@6c48a", - "displayName": "召神令", + "displayName": "滞行牌", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "7a37ff08-cd20-465b-8fd6-3df3c21050cc@f9941", - "displayName": "召神令", + "displayName": "滞行牌", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/bundles/icons/shopSkill/九天天鼓.png b/assets/bundles/icons/shopSkill/灾厄盒.png similarity index 100% rename from assets/bundles/icons/shopSkill/九天天鼓.png rename to assets/bundles/icons/shopSkill/灾厄盒.png diff --git a/assets/bundles/icons/shopSkill/九天天鼓.png.meta b/assets/bundles/icons/shopSkill/灾厄盒.png.meta similarity index 97% rename from assets/bundles/icons/shopSkill/九天天鼓.png.meta rename to assets/bundles/icons/shopSkill/灾厄盒.png.meta index 770fa99..6223257 100644 --- a/assets/bundles/icons/shopSkill/九天天鼓.png.meta +++ b/assets/bundles/icons/shopSkill/灾厄盒.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "f065552c-b573-4a32-9fdb-e5446cd83e2e@6c48a", - "displayName": "九天天鼓", + "displayName": "灾厄盒", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "f065552c-b573-4a32-9fdb-e5446cd83e2e@f9941", - "displayName": "九天天鼓", + "displayName": "灾厄盒", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/bundles/icons/shopSkill/省金契.png b/assets/bundles/icons/shopSkill/省金契.png new file mode 100644 index 0000000..64b3b6f Binary files /dev/null and b/assets/bundles/icons/shopSkill/省金契.png differ diff --git a/assets/bundles/icons/shopSkill/云麾号角.png.meta b/assets/bundles/icons/shopSkill/省金契.png.meta similarity index 97% rename from assets/bundles/icons/shopSkill/云麾号角.png.meta rename to assets/bundles/icons/shopSkill/省金契.png.meta index 4c6f85a..9975dd9 100644 --- a/assets/bundles/icons/shopSkill/云麾号角.png.meta +++ b/assets/bundles/icons/shopSkill/省金契.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "7a21b954-893d-4c3b-8968-2abf22957cc7@6c48a", - "displayName": "云麾号角", + "displayName": "省金契", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "7a21b954-893d-4c3b-8968-2abf22957cc7@f9941", - "displayName": "云麾号角", + "displayName": "省金契", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/bundles/icons/shopSkill/碎法帝钟.png b/assets/bundles/icons/shopSkill/碎法帝钟.png deleted file mode 100644 index 0c495ce..0000000 Binary files a/assets/bundles/icons/shopSkill/碎法帝钟.png and /dev/null differ diff --git a/assets/bundles/icons/shopSkill/碎法帝钟.png.meta b/assets/bundles/icons/shopSkill/碎法帝钟.png.meta deleted file mode 100644 index 59e48fd..0000000 --- a/assets/bundles/icons/shopSkill/碎法帝钟.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "1642b307-96bd-4991-ae57-d85ee57fcb2a", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "1642b307-96bd-4991-ae57-d85ee57fcb2a@6c48a", - "displayName": "碎法帝钟", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "1642b307-96bd-4991-ae57-d85ee57fcb2a", - "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": "1642b307-96bd-4991-ae57-d85ee57fcb2a@f9941", - "displayName": "碎法帝钟", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 35, - "trimY": 24, - "width": 130, - "height": 152, - "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": [ - -65, - -76, - 0, - 65, - -76, - 0, - -65, - 76, - 0, - 65, - 76, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 35, - 176, - 165, - 176, - 35, - 24, - 165, - 24 - ], - "nuv": [ - 0.175, - 0.12, - 0.825, - 0.12, - 0.175, - 0.88, - 0.825, - 0.88 - ], - "minPos": [ - -65, - -76, - 0 - ], - "maxPos": [ - 65, - 76, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "1642b307-96bd-4991-ae57-d85ee57fcb2a@6c48a", - "atlasUuid": "", - "trimType": "auto" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "hasAlpha": true, - "redirect": "1642b307-96bd-4991-ae57-d85ee57fcb2a@6c48a" - } -} diff --git a/assets/bundles/icons/shopSkill/缚仙网.png b/assets/bundles/icons/shopSkill/缚仙网.png deleted file mode 100644 index 24ec397..0000000 Binary files a/assets/bundles/icons/shopSkill/缚仙网.png and /dev/null differ diff --git a/assets/bundles/icons/shopSkill/缚仙网.png.meta b/assets/bundles/icons/shopSkill/缚仙网.png.meta deleted file mode 100644 index 022ab12..0000000 --- a/assets/bundles/icons/shopSkill/缚仙网.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "f39faa3b-0571-4d3d-a740-06bd33eaec2c", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "f39faa3b-0571-4d3d-a740-06bd33eaec2c@6c48a", - "displayName": "缚仙网", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "f39faa3b-0571-4d3d-a740-06bd33eaec2c", - "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": "f39faa3b-0571-4d3d-a740-06bd33eaec2c@f9941", - "displayName": "缚仙网", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0.5, - "trimX": 22, - "trimY": 26, - "width": 156, - "height": 147, - "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": [ - -78, - -73.5, - 0, - 78, - -73.5, - 0, - -78, - 73.5, - 0, - 78, - 73.5, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 22, - 174, - 178, - 174, - 22, - 27, - 178, - 27 - ], - "nuv": [ - 0.11, - 0.135, - 0.89, - 0.135, - 0.11, - 0.87, - 0.89, - 0.87 - ], - "minPos": [ - -78, - -73.5, - 0 - ], - "maxPos": [ - 78, - 73.5, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "f39faa3b-0571-4d3d-a740-06bd33eaec2c@6c48a", - "atlasUuid": "", - "trimType": "auto" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "hasAlpha": true, - "redirect": "f39faa3b-0571-4d3d-a740-06bd33eaec2c@6c48a" - } -} diff --git a/assets/bundles/icons/shopSkill/乾坤袋.png b/assets/bundles/icons/shopSkill/能量石.png similarity index 100% rename from assets/bundles/icons/shopSkill/乾坤袋.png rename to assets/bundles/icons/shopSkill/能量石.png diff --git a/assets/bundles/icons/shopSkill/乾坤袋.png.meta b/assets/bundles/icons/shopSkill/能量石.png.meta similarity index 97% rename from assets/bundles/icons/shopSkill/乾坤袋.png.meta rename to assets/bundles/icons/shopSkill/能量石.png.meta index ca3345e..3794db6 100644 --- a/assets/bundles/icons/shopSkill/乾坤袋.png.meta +++ b/assets/bundles/icons/shopSkill/能量石.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "4969521f-b494-458b-8633-40d913b97eca@6c48a", - "displayName": "乾坤袋", + "displayName": "能量石", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "4969521f-b494-458b-8633-40d913b97eca@f9941", - "displayName": "乾坤袋", + "displayName": "能量石", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/bundles/icons/shopSkill/蟠桃树.png b/assets/bundles/icons/shopSkill/蟠桃树.png deleted file mode 100644 index 5641d91..0000000 Binary files a/assets/bundles/icons/shopSkill/蟠桃树.png and /dev/null differ diff --git a/assets/bundles/icons/shopSkill/蟠桃树.png.meta b/assets/bundles/icons/shopSkill/蟠桃树.png.meta deleted file mode 100644 index 3243282..0000000 --- a/assets/bundles/icons/shopSkill/蟠桃树.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "e13ed607-4c81-4025-b076-a2f76e403566", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "e13ed607-4c81-4025-b076-a2f76e403566@6c48a", - "displayName": "蟠桃树", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "e13ed607-4c81-4025-b076-a2f76e403566", - "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": "e13ed607-4c81-4025-b076-a2f76e403566@f9941", - "displayName": "蟠桃树", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": -0.5, - "offsetY": 0.5, - "trimX": 4, - "trimY": 28, - "width": 191, - "height": 143, - "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": [ - -95.5, - -71.5, - 0, - 95.5, - -71.5, - 0, - -95.5, - 71.5, - 0, - 95.5, - 71.5, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 4, - 172, - 195, - 172, - 4, - 29, - 195, - 29 - ], - "nuv": [ - 0.02, - 0.145, - 0.975, - 0.145, - 0.02, - 0.86, - 0.975, - 0.86 - ], - "minPos": [ - -95.5, - -71.5, - 0 - ], - "maxPos": [ - 95.5, - 71.5, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "e13ed607-4c81-4025-b076-a2f76e403566@6c48a", - "atlasUuid": "", - "trimType": "auto" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "hasAlpha": true, - "redirect": "e13ed607-4c81-4025-b076-a2f76e403566@6c48a" - } -} diff --git a/assets/bundles/icons/shopSkill/镇宅牌.png b/assets/bundles/icons/shopSkill/赏金令.png similarity index 100% rename from assets/bundles/icons/shopSkill/镇宅牌.png rename to assets/bundles/icons/shopSkill/赏金令.png diff --git a/assets/bundles/icons/shopSkill/镇宅牌.png.meta b/assets/bundles/icons/shopSkill/赏金令.png.meta similarity index 97% rename from assets/bundles/icons/shopSkill/镇宅牌.png.meta rename to assets/bundles/icons/shopSkill/赏金令.png.meta index 8270222..d0f5fdb 100644 --- a/assets/bundles/icons/shopSkill/镇宅牌.png.meta +++ b/assets/bundles/icons/shopSkill/赏金令.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "c99da12c-dc97-4177-9f22-a6acbfddd2c1@6c48a", - "displayName": "镇宅牌", + "displayName": "赏金令", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "c99da12c-dc97-4177-9f22-a6acbfddd2c1@f9941", - "displayName": "镇宅牌", + "displayName": "赏金令", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/bundles/icons/shopSkill/还魂丹.png b/assets/bundles/icons/shopSkill/还魂丹.png deleted file mode 100644 index f0a0569..0000000 Binary files a/assets/bundles/icons/shopSkill/还魂丹.png and /dev/null differ diff --git a/assets/bundles/icons/shopSkill/还魂丹.png.meta b/assets/bundles/icons/shopSkill/还魂丹.png.meta deleted file mode 100644 index c1d3682..0000000 --- a/assets/bundles/icons/shopSkill/还魂丹.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "9bf0e622-f294-4975-a2ed-aa9fdd78c76b", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "9bf0e622-f294-4975-a2ed-aa9fdd78c76b@6c48a", - "displayName": "还魂丹", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "9bf0e622-f294-4975-a2ed-aa9fdd78c76b", - "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": "9bf0e622-f294-4975-a2ed-aa9fdd78c76b@f9941", - "displayName": "还魂丹", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": -0.5, - "offsetY": 0, - "trimX": 30, - "trimY": 29, - "width": 139, - "height": 142, - "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": [ - -69.5, - -71, - 0, - 69.5, - -71, - 0, - -69.5, - 71, - 0, - 69.5, - 71, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 30, - 171, - 169, - 171, - 30, - 29, - 169, - 29 - ], - "nuv": [ - 0.15, - 0.145, - 0.845, - 0.145, - 0.15, - 0.855, - 0.845, - 0.855 - ], - "minPos": [ - -69.5, - -71, - 0 - ], - "maxPos": [ - 69.5, - 71, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "9bf0e622-f294-4975-a2ed-aa9fdd78c76b@6c48a", - "atlasUuid": "", - "trimType": "auto" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "hasAlpha": true, - "redirect": "9bf0e622-f294-4975-a2ed-aa9fdd78c76b@6c48a" - } -} diff --git a/assets/bundles/icons/shopSkill/弱水.png b/assets/bundles/icons/shopSkill/金矿.png similarity index 100% rename from assets/bundles/icons/shopSkill/弱水.png rename to assets/bundles/icons/shopSkill/金矿.png diff --git a/assets/bundles/icons/shopSkill/弱水.png.meta b/assets/bundles/icons/shopSkill/金矿.png.meta similarity index 97% rename from assets/bundles/icons/shopSkill/弱水.png.meta rename to assets/bundles/icons/shopSkill/金矿.png.meta index e49749f..193b634 100644 --- a/assets/bundles/icons/shopSkill/弱水.png.meta +++ b/assets/bundles/icons/shopSkill/金矿.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "df7e53fa-affd-4030-8b8c-598de6fa5d82@6c48a", - "displayName": "弱水", + "displayName": "金矿", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "df7e53fa-affd-4030-8b8c-598de6fa5d82@f9941", - "displayName": "弱水", + "displayName": "金矿", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/bundles/icons/shopSkill/鏖战册.png b/assets/bundles/icons/shopSkill/鏖战册.png new file mode 100644 index 0000000..08c0f58 Binary files /dev/null and b/assets/bundles/icons/shopSkill/鏖战册.png differ diff --git a/assets/bundles/icons/shopSkill/鏖战册.png.meta b/assets/bundles/icons/shopSkill/鏖战册.png.meta new file mode 100644 index 0000000..db88959 --- /dev/null +++ b/assets/bundles/icons/shopSkill/鏖战册.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "76fa20d3-71f7-484a-8e5d-9c3b67fe1f9d", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "76fa20d3-71f7-484a-8e5d-9c3b67fe1f9d@6c48a", + "displayName": "鏖战册", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "76fa20d3-71f7-484a-8e5d-9c3b67fe1f9d", + "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": "76fa20d3-71f7-484a-8e5d-9c3b67fe1f9d@f9941", + "displayName": "鏖战册", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": -0.5, + "offsetY": 0, + "trimX": 20, + "trimY": 40, + "width": 159, + "height": 120, + "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": [ + -79.5, + -60, + 0, + 79.5, + -60, + 0, + -79.5, + 60, + 0, + 79.5, + 60, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 20, + 160, + 179, + 160, + 20, + 40, + 179, + 40 + ], + "nuv": [ + 0.1, + 0.2, + 0.895, + 0.2, + 0.1, + 0.8, + 0.895, + 0.8 + ], + "minPos": [ + -79.5, + -60, + 0 + ], + "maxPos": [ + 79.5, + 60, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "76fa20d3-71f7-484a-8e5d-9c3b67fe1f9d@6c48a", + "atlasUuid": "", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "redirect": "76fa20d3-71f7-484a-8e5d-9c3b67fe1f9d@6c48a" + } +} diff --git a/配置表/excelList/~$随机buff.xlsx b/配置表/excelList/~$随机buff.xlsx new file mode 100644 index 0000000..6e7142c Binary files /dev/null and b/配置表/excelList/~$随机buff.xlsx differ