From abbaf79462dd93647da98684fa3f15cf786be97b Mon Sep 17 00:00:00 2001 From: humingxing <930621236@qq.com> Date: Tue, 13 Oct 2026 19:10:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/bundles/first/config/Battlebuff.json | 70 +++++++++--------- assets/bundles/first/config/Const.json | 6 ++ .../绿.png => bundles/icons/img/b1.png} | Bin .../icons/img/b1.png.meta} | 4 +- .../蓝.png => bundles/icons/img/b2.png} | Bin .../icons/img/b2.png.meta} | 4 +- .../紫.png => bundles/icons/img/b3.png} | Bin .../icons/img/b3.png.meta} | 4 +- .../橙.png => bundles/icons/img/b4.png} | Bin .../icons/img/b4.png.meta} | 4 +- .../C级.png => bundles/icons/img/q1.png} | Bin .../icons/img/q1.png.meta} | 4 +- .../B级.png => bundles/icons/img/q2.png} | Bin .../icons/img/q2.png.meta} | 4 +- .../A级.png => bundles/icons/img/q3.png} | Bin .../icons/img/q3.png.meta} | 4 +- .../S级.png => bundles/icons/img/q4.png} | Bin .../icons/img/q4.png.meta} | 4 +- assets/script/interface/AutoTable.ts | 2 +- 配置表/excelList/常量表.xlsx | Bin 11440 -> 11477 bytes 20 files changed, 58 insertions(+), 52 deletions(-) rename assets/{res/popBattle/popSelect/texture/绿.png => bundles/icons/img/b1.png} (100%) rename assets/{res/popBattle/popSelect/texture/绿.png.meta => bundles/icons/img/b1.png.meta} (98%) rename assets/{res/popBattle/popSelect/texture/蓝.png => bundles/icons/img/b2.png} (100%) rename assets/{res/popBattle/popSelect/texture/蓝.png.meta => bundles/icons/img/b2.png.meta} (98%) rename assets/{res/popBattle/popSelect/texture/紫.png => bundles/icons/img/b3.png} (100%) rename assets/{res/popBattle/popSelect/texture/紫.png.meta => bundles/icons/img/b3.png.meta} (98%) rename assets/{res/popBattle/popSelect/texture/橙.png => bundles/icons/img/b4.png} (100%) rename assets/{res/popBattle/popSelect/texture/橙.png.meta => bundles/icons/img/b4.png.meta} (98%) rename assets/{res/popBattle/popSelect/texture/C级.png => bundles/icons/img/q1.png} (100%) rename assets/{res/popBattle/popSelect/texture/C级.png.meta => bundles/icons/img/q1.png.meta} (97%) rename assets/{res/popBattle/popSelect/texture/B级.png => bundles/icons/img/q2.png} (100%) rename assets/{res/popBattle/popSelect/texture/B级.png.meta => bundles/icons/img/q2.png.meta} (97%) rename assets/{res/popBattle/popSelect/texture/A级.png => bundles/icons/img/q3.png} (100%) rename assets/{res/popBattle/popSelect/texture/A级.png.meta => bundles/icons/img/q3.png.meta} (97%) rename assets/{res/popBattle/popSelect/texture/S级.png => bundles/icons/img/q4.png} (100%) rename assets/{res/popBattle/popSelect/texture/S级.png.meta => bundles/icons/img/q4.png.meta} (97%) diff --git a/assets/bundles/first/config/Battlebuff.json b/assets/bundles/first/config/Battlebuff.json index 755a982..5a48769 100644 --- a/assets/bundles/first/config/Battlebuff.json +++ b/assets/bundles/first/config/Battlebuff.json @@ -2,7 +2,7 @@ { "id": 1, "name": "灾厄盒", - "number": 1, + "limit": 1, "desc": "Boss出现几率翻倍", "icon": "灾厄盒", "quality": 2, @@ -16,7 +16,7 @@ { "id": 2, "name": "倍率卡", - "number": 1, + "limit": 1, "desc": "一定几率召唤出倍率卡，拖到数字上升1级或2级", "icon": "倍率卡", "quality": 4, @@ -30,7 +30,7 @@ { "id": 3, "name": "攻速符", - "number": 1, + "limit": 1, "desc": "我方所有数字攻速+40%", "icon": "攻速符", "quality": 3, @@ -44,7 +44,7 @@ { "id": 4, "name": "赏金令", - "number": 1, + "limit": 1, "desc": "击杀怪物后，20%概率多获得一个金币", "icon": "赏金令", "quality": 2, @@ -58,7 +58,7 @@ { "id": 5, "name": "倍增卡", - "number": 1, + "limit": 1, "desc": "召唤出的数字，一定几率*2", "icon": "倍增卡", "quality": 2, @@ -72,7 +72,7 @@ { "id": 6, "name": "幸运石", - "number": 1, + "limit": 1, "desc": "宝石掉落几率+50%", "icon": "幸运石", "quality": 3, @@ -86,7 +86,7 @@ { "id": 7, "name": "鏖战册", - "number": 1, + "limit": 1, "desc": "我方攻速+50%，对方攻速+30%", "icon": "鏖战册", "quality": 3, @@ -100,7 +100,7 @@ { "id": 8, "name": "气血丸", - "number": 1, + "limit": 1, "desc": "我方π的血量+3", "icon": "气血丸", "quality": 2, @@ -114,7 +114,7 @@ { "id": 9, "name": "双生盾", - "number": 1, + "limit": 1, "desc": "我方π血量+5，对方+3", "icon": "双生盾", "quality": 3, @@ -128,7 +128,7 @@ { "id": 10, "name": "寻金尺", - "number": 1, + "limit": 1, "desc": "解锁地块时额外产生金币", "icon": "寻金尺", "quality": 4, @@ -142,7 +142,7 @@ { "id": 11, "name": "御雷珠", - "number": 1, + "limit": 1, "desc": "怪物接近我方π时降下雷电消灭怪物", "icon": "御雷珠", "quality": 4, @@ -156,7 +156,7 @@ { "id": 12, "name": "省金契", - "number": 1, + "limit": 1, "desc": "召唤数字消耗的金币-10%", "icon": "省金契", "quality": 2, @@ -170,7 +170,7 @@ { "id": 13, "name": "滞行牌", - "number": 1, + "limit": 1, "desc": "我方怪物行进速度-10%", "icon": "滞行牌", "quality": 1, @@ -184,7 +184,7 @@ { "id": 14, "name": "金矿", - "number": 1, + "limit": 1, "desc": "每10S生产一枚金币", "icon": "金矿", "quality": 3, @@ -198,7 +198,7 @@ { "id": 15, "name": "属性卡", - "number": 1, + "limit": 1, "desc": "一定几率召唤出属性卡，拖到数字上随机变换一个属性", "icon": "属性卡", "quality": 3, @@ -212,7 +212,7 @@ { "id": 1011, "name": "金系数字伤害+20%", - "number": 99, + "limit": 99, "desc": "金系数字伤害+20%", "icon": "", "quality": 1, @@ -226,7 +226,7 @@ { "id": 1012, "name": "金系数字暴击+20%", - "number": 99, + "limit": 99, "desc": "金系数字暴击+20%", "icon": "", "quality": 2, @@ -240,7 +240,7 @@ { "id": 1013, "name": "金系数字爆伤+20%", - "number": 99, + "limit": 99, "desc": "金系数字爆伤+20%", "icon": "", "quality": 3, @@ -254,7 +254,7 @@ { "id": 1014, "name": "金系数字攻速+20%", - "number": 99, + "limit": 99, "desc": "金系数字攻速+20%", "icon": "", "quality": 4, @@ -268,7 +268,7 @@ { "id": 2011, "name": "木系数字伤害+20%", - "number": 99, + "limit": 99, "desc": "木系数字伤害+20%", "icon": "", "quality": 1, @@ -282,7 +282,7 @@ { "id": 2012, "name": "木系数字暴击+20%", - "number": 99, + "limit": 99, "desc": "木系数字暴击+20%", "icon": "", "quality": 2, @@ -296,7 +296,7 @@ { "id": 2013, "name": "木系数字爆伤+20%", - "number": 99, + "limit": 99, "desc": "木系数字爆伤+20%", "icon": "", "quality": 3, @@ -310,7 +310,7 @@ { "id": 2014, "name": "木系数字攻速+20%", - "number": 99, + "limit": 99, "desc": "木系数字攻速+20%", "icon": "", "quality": 4, @@ -324,7 +324,7 @@ { "id": 3011, "name": "水系数字伤害+20%", - "number": 99, + "limit": 99, "desc": "水系数字伤害+20%", "icon": "", "quality": 1, @@ -338,7 +338,7 @@ { "id": 3012, "name": "水系数字暴击+20%", - "number": 99, + "limit": 99, "desc": "水系数字暴击+20%", "icon": "", "quality": 2, @@ -352,7 +352,7 @@ { "id": 3013, "name": "水系数字爆伤+20%", - "number": 99, + "limit": 99, "desc": "水系数字爆伤+20%", "icon": "", "quality": 3, @@ -366,7 +366,7 @@ { "id": 3014, "name": "水系数字攻速+20%", - "number": 99, + "limit": 99, "desc": "水系数字攻速+20%", "icon": "", "quality": 4, @@ -380,7 +380,7 @@ { "id": 4011, "name": "火系数字伤害+20%", - "number": 99, + "limit": 99, "desc": "火系数字伤害+20%", "icon": "", "quality": 1, @@ -394,7 +394,7 @@ { "id": 4012, "name": "火系数字暴击+20%", - "number": 99, + "limit": 99, "desc": "火系数字暴击+20%", "icon": "", "quality": 2, @@ -408,7 +408,7 @@ { "id": 4013, "name": "火系数字爆伤+20%", - "number": 99, + "limit": 99, "desc": "火系数字爆伤+20%", "icon": "", "quality": 3, @@ -422,7 +422,7 @@ { "id": 4014, "name": "火系数字攻速+20%", - "number": 99, + "limit": 99, "desc": "火系数字攻速+20%", "icon": "", "quality": 4, @@ -436,7 +436,7 @@ { "id": 5011, "name": "土系数字伤害+20%", - "number": 99, + "limit": 99, "desc": "土系数字伤害+20%", "icon": "", "quality": 1, @@ -450,7 +450,7 @@ { "id": 5012, "name": "土系数字暴击+20%", - "number": 99, + "limit": 99, "desc": "土系数字暴击+20%", "icon": "", "quality": 2, @@ -464,7 +464,7 @@ { "id": 5013, "name": "土系数字爆伤+20%", - "number": 99, + "limit": 99, "desc": "土系数字爆伤+20%", "icon": "", "quality": 3, @@ -478,7 +478,7 @@ { "id": 5014, "name": "土系数字攻速+20%", - "number": 99, + "limit": 99, "desc": "土系数字攻速+20%", "icon": "", "quality": 4, diff --git a/assets/bundles/first/config/Const.json b/assets/bundles/first/config/Const.json index f302bb3..0bbe71e 100644 --- a/assets/bundles/first/config/Const.json +++ b/assets/bundles/first/config/Const.json @@ -208,5 +208,11 @@ "desc": "广告刷新橙色权重加值（次数，加值）", "para": 0, "para1": "3,5" + }, + { + "id": 36, + "desc": "3选1免费刷新次数", + "para": 1, + "para1": "" } ] \ No newline at end of file diff --git a/assets/res/popBattle/popSelect/texture/绿.png b/assets/bundles/icons/img/b1.png similarity index 100% rename from assets/res/popBattle/popSelect/texture/绿.png rename to assets/bundles/icons/img/b1.png diff --git a/assets/res/popBattle/popSelect/texture/绿.png.meta b/assets/bundles/icons/img/b1.png.meta similarity index 98% rename from assets/res/popBattle/popSelect/texture/绿.png.meta rename to assets/bundles/icons/img/b1.png.meta index 011bae4..11ef870 100644 --- a/assets/res/popBattle/popSelect/texture/绿.png.meta +++ b/assets/bundles/icons/img/b1.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "49650bcb-1b85-4658-ad45-d7d3e3d10b43@6c48a", - "displayName": "绿", + "displayName": "b1", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "49650bcb-1b85-4658-ad45-d7d3e3d10b43@f9941", - "displayName": "绿", + "displayName": "b1", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/res/popBattle/popSelect/texture/蓝.png b/assets/bundles/icons/img/b2.png similarity index 100% rename from assets/res/popBattle/popSelect/texture/蓝.png rename to assets/bundles/icons/img/b2.png diff --git a/assets/res/popBattle/popSelect/texture/蓝.png.meta b/assets/bundles/icons/img/b2.png.meta similarity index 98% rename from assets/res/popBattle/popSelect/texture/蓝.png.meta rename to assets/bundles/icons/img/b2.png.meta index 54de28e..4e5aad6 100644 --- a/assets/res/popBattle/popSelect/texture/蓝.png.meta +++ b/assets/bundles/icons/img/b2.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "996843d9-14ff-4bb4-a286-970bf92eb48a@6c48a", - "displayName": "蓝", + "displayName": "b2", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "996843d9-14ff-4bb4-a286-970bf92eb48a@f9941", - "displayName": "蓝", + "displayName": "b2", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/res/popBattle/popSelect/texture/紫.png b/assets/bundles/icons/img/b3.png similarity index 100% rename from assets/res/popBattle/popSelect/texture/紫.png rename to assets/bundles/icons/img/b3.png diff --git a/assets/res/popBattle/popSelect/texture/紫.png.meta b/assets/bundles/icons/img/b3.png.meta similarity index 98% rename from assets/res/popBattle/popSelect/texture/紫.png.meta rename to assets/bundles/icons/img/b3.png.meta index 197f526..a79d086 100644 --- a/assets/res/popBattle/popSelect/texture/紫.png.meta +++ b/assets/bundles/icons/img/b3.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "d6acac2d-b989-4a35-a111-d0e4b005eb36@6c48a", - "displayName": "紫", + "displayName": "b3", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "d6acac2d-b989-4a35-a111-d0e4b005eb36@f9941", - "displayName": "紫", + "displayName": "b3", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/res/popBattle/popSelect/texture/橙.png b/assets/bundles/icons/img/b4.png similarity index 100% rename from assets/res/popBattle/popSelect/texture/橙.png rename to assets/bundles/icons/img/b4.png diff --git a/assets/res/popBattle/popSelect/texture/橙.png.meta b/assets/bundles/icons/img/b4.png.meta similarity index 98% rename from assets/res/popBattle/popSelect/texture/橙.png.meta rename to assets/bundles/icons/img/b4.png.meta index 97d90eb..d92d71a 100644 --- a/assets/res/popBattle/popSelect/texture/橙.png.meta +++ b/assets/bundles/icons/img/b4.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "3f45d54f-19f3-4967-b58a-b3a8eb1af318@6c48a", - "displayName": "橙", + "displayName": "b4", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "3f45d54f-19f3-4967-b58a-b3a8eb1af318@f9941", - "displayName": "橙", + "displayName": "b4", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/res/popBattle/popSelect/texture/C级.png b/assets/bundles/icons/img/q1.png similarity index 100% rename from assets/res/popBattle/popSelect/texture/C级.png rename to assets/bundles/icons/img/q1.png diff --git a/assets/res/popBattle/popSelect/texture/C级.png.meta b/assets/bundles/icons/img/q1.png.meta similarity index 97% rename from assets/res/popBattle/popSelect/texture/C级.png.meta rename to assets/bundles/icons/img/q1.png.meta index 7588a13..fc5f725 100644 --- a/assets/res/popBattle/popSelect/texture/C级.png.meta +++ b/assets/bundles/icons/img/q1.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "462e84ea-cecf-4663-a42b-4b1752387359@6c48a", - "displayName": "C级", + "displayName": "q1", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "462e84ea-cecf-4663-a42b-4b1752387359@f9941", - "displayName": "C级", + "displayName": "q1", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/res/popBattle/popSelect/texture/B级.png b/assets/bundles/icons/img/q2.png similarity index 100% rename from assets/res/popBattle/popSelect/texture/B级.png rename to assets/bundles/icons/img/q2.png diff --git a/assets/res/popBattle/popSelect/texture/B级.png.meta b/assets/bundles/icons/img/q2.png.meta similarity index 97% rename from assets/res/popBattle/popSelect/texture/B级.png.meta rename to assets/bundles/icons/img/q2.png.meta index d84df1e..b0470f0 100644 --- a/assets/res/popBattle/popSelect/texture/B级.png.meta +++ b/assets/bundles/icons/img/q2.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "48986846-eae8-49c7-a62a-7786fd6201f8@6c48a", - "displayName": "B级", + "displayName": "q2", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "48986846-eae8-49c7-a62a-7786fd6201f8@f9941", - "displayName": "B级", + "displayName": "q2", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/res/popBattle/popSelect/texture/A级.png b/assets/bundles/icons/img/q3.png similarity index 100% rename from assets/res/popBattle/popSelect/texture/A级.png rename to assets/bundles/icons/img/q3.png diff --git a/assets/res/popBattle/popSelect/texture/A级.png.meta b/assets/bundles/icons/img/q3.png.meta similarity index 97% rename from assets/res/popBattle/popSelect/texture/A级.png.meta rename to assets/bundles/icons/img/q3.png.meta index cdaa54c..900f88c 100644 --- a/assets/res/popBattle/popSelect/texture/A级.png.meta +++ b/assets/bundles/icons/img/q3.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "8322760d-efd8-4f76-a499-d547ccca506d@6c48a", - "displayName": "A级", + "displayName": "q3", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "8322760d-efd8-4f76-a499-d547ccca506d@f9941", - "displayName": "A级", + "displayName": "q3", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/res/popBattle/popSelect/texture/S级.png b/assets/bundles/icons/img/q4.png similarity index 100% rename from assets/res/popBattle/popSelect/texture/S级.png rename to assets/bundles/icons/img/q4.png diff --git a/assets/res/popBattle/popSelect/texture/S级.png.meta b/assets/bundles/icons/img/q4.png.meta similarity index 97% rename from assets/res/popBattle/popSelect/texture/S级.png.meta rename to assets/bundles/icons/img/q4.png.meta index 282691c..6839066 100644 --- a/assets/res/popBattle/popSelect/texture/S级.png.meta +++ b/assets/bundles/icons/img/q4.png.meta @@ -11,7 +11,7 @@ "6c48a": { "importer": "texture", "uuid": "5b8d2eca-0d05-49bf-bca4-2cf5e1ca63b0@6c48a", - "displayName": "S级", + "displayName": "q4", "id": "6c48a", "name": "texture", "userData": { @@ -35,7 +35,7 @@ "f9941": { "importer": "sprite-frame", "uuid": "5b8d2eca-0d05-49bf-bca4-2cf5e1ca63b0@f9941", - "displayName": "S级", + "displayName": "q4", "id": "f9941", "name": "spriteFrame", "userData": { diff --git a/assets/script/interface/AutoTable.ts b/assets/script/interface/AutoTable.ts index b62ac34..e2c2446 100644 --- a/assets/script/interface/AutoTable.ts +++ b/assets/script/interface/AutoTable.ts @@ -439,7 +439,7 @@ declare global { /** 武器名称 */ readonly name: string; /** 数量限制 */ - readonly number: number; + readonly limit: number; /** 描述 */ readonly desc: string; /** 图标 */ diff --git a/配置表/excelList/常量表.xlsx b/配置表/excelList/常量表.xlsx index bca8dd885daa15bf95526c15c75543499f785af3..d8b726b487da5c1ee6a8cf8f19fdd5c2be7a2ee7 100644 GIT binary patch delta 3449 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 b2P|C)3tR-Is0IK4rIT$eJqEZa000000ri+P delta 3403 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