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 bca8dd8..d8b726b 100644 Binary files a/配置表/excelList/常量表.xlsx and b/配置表/excelList/常量表.xlsx differ