diff --git a/DataTables/Datas/__tables__.xlsx b/DataTables/Datas/__tables__.xlsx index 38156871..28e2bb00 100644 Binary files a/DataTables/Datas/__tables__.xlsx and b/DataTables/Datas/__tables__.xlsx differ diff --git a/DataTables/Datas/副本系统/副本表.xlsx b/DataTables/Datas/副本系统/副本表.xlsx index 2b934e59..919c1d29 100644 Binary files a/DataTables/Datas/副本系统/副本表.xlsx and b/DataTables/Datas/副本系统/副本表.xlsx differ diff --git a/DataTables/Datas/副本系统/金币副本表.xlsx b/DataTables/Datas/副本系统/金币副本表.xlsx index eb812709..084ada6e 100644 Binary files a/DataTables/Datas/副本系统/金币副本表.xlsx and b/DataTables/Datas/副本系统/金币副本表.xlsx differ diff --git a/DataTables/Datas/副本系统/锻造石副本表.xlsx b/DataTables/Datas/副本系统/锻造石副本表.xlsx index 109e2775..aa898d3e 100644 Binary files a/DataTables/Datas/副本系统/锻造石副本表.xlsx and b/DataTables/Datas/副本系统/锻造石副本表.xlsx differ diff --git a/DataTables/Datas/常用/资源表.xlsx b/DataTables/Datas/常用/资源表.xlsx index 746e960a..28dbed8d 100644 Binary files a/DataTables/Datas/常用/资源表.xlsx and b/DataTables/Datas/常用/资源表.xlsx differ diff --git a/DataTables/Datas/战斗/宠物/宠物攻击.xlsx b/DataTables/Datas/战斗/宠物/宠物攻击.xlsx index 899cadc0..8f7446c5 100644 Binary files a/DataTables/Datas/战斗/宠物/宠物攻击.xlsx and b/DataTables/Datas/战斗/宠物/宠物攻击.xlsx differ diff --git a/DataTables/Datas/战斗/宠物/宠物表.xlsx b/DataTables/Datas/战斗/宠物/宠物表.xlsx index 386a8626..31fcb3b6 100644 Binary files a/DataTables/Datas/战斗/宠物/宠物表.xlsx and b/DataTables/Datas/战斗/宠物/宠物表.xlsx differ diff --git a/JisolGameCocos/assets/resources/WorldCanvas.prefab b/JisolGameCocos/assets/resources/WorldCanvas.prefab index e44cbb65..c7696836 100644 --- a/JisolGameCocos/assets/resources/WorldCanvas.prefab +++ b/JisolGameCocos/assets/resources/WorldCanvas.prefab @@ -352,6 +352,10 @@ { "__uuid__": "cb2991f1-750a-4493-81df-781807f8bec2", "__expectedType__": "cc.Prefab" + }, + { + "__uuid__": "8f463b64-9907-4670-9316-dabccb947cb4", + "__expectedType__": "cc.Prefab" } ], "_id": "" diff --git a/JisolGameCocos/assets/resources/config/json/tbgresource.json b/JisolGameCocos/assets/resources/config/json/tbgresource.json index 1c53050b..efc4cb55 100644 --- a/JisolGameCocos/assets/resources/config/json/tbgresource.json +++ b/JisolGameCocos/assets/resources/config/json/tbgresource.json @@ -16,5 +16,17 @@ "name": "通用加速卷", "tig": "加速卷 用来加速一切需要时间的东西 减少冷却:60s", "args": "60" + }, + { + "id": 90004, + "name": "钥匙:金币副本", + "tig": "金币副本的钥匙", + "args": "" + }, + { + "id": 90005, + "name": "钥匙:锻造石副本", + "tig": "锻造石副本的钥匙", + "args": "" } ] \ No newline at end of file diff --git a/JisolGameCocos/assets/resources/config/json/tbgrole.json b/JisolGameCocos/assets/resources/config/json/tbgrole.json index 0bb8e179..0549458e 100644 --- a/JisolGameCocos/assets/resources/config/json/tbgrole.json +++ b/JisolGameCocos/assets/resources/config/json/tbgrole.json @@ -5,7 +5,8 @@ "spine": 130001, "roleSkillIds": [], "roleAttackRange": 100, - "roleHight": 140 + "roleHight": 140, + "roleScale": 1 }, { "id": 10002, @@ -13,7 +14,8 @@ "spine": 130002, "roleSkillIds": [], "roleAttackRange": 100, - "roleHight": 140 + "roleHight": 140, + "roleScale": 1 }, { "id": 10003, @@ -23,7 +25,8 @@ 40001 ], "roleAttackRange": 500, - "roleHight": 140 + "roleHight": 140, + "roleScale": 1 }, { "id": 10004, @@ -33,7 +36,8 @@ 40002 ], "roleAttackRange": 350, - "roleHight": 140 + "roleHight": 140, + "roleScale": 1 }, { "id": 10005, @@ -41,7 +45,8 @@ "spine": 130005, "roleSkillIds": [], "roleAttackRange": 350, - "roleHight": 140 + "roleHight": 140, + "roleScale": 1 }, { "id": 10006, @@ -49,7 +54,8 @@ "spine": 130006, "roleSkillIds": [], "roleAttackRange": 500, - "roleHight": 140 + "roleHight": 140, + "roleScale": 1 }, { "id": 10007, @@ -59,6 +65,16 @@ 40003 ], "roleAttackRange": 100, - "roleHight": 140 + "roleHight": 140, + "roleScale": 1 + }, + { + "id": 170001, + "roleName": "雷吉艾斯", + "spine": 130005, + "roleSkillIds": [], + "roleAttackRange": 700, + "roleHight": 140, + "roleScale": 2 } ] \ No newline at end of file diff --git a/JisolGameCocos/assets/resources/config/json/tbgroleattack.json b/JisolGameCocos/assets/resources/config/json/tbgroleattack.json index 4b6f651a..2bd05462 100644 --- a/JisolGameCocos/assets/resources/config/json/tbgroleattack.json +++ b/JisolGameCocos/assets/resources/config/json/tbgroleattack.json @@ -44,5 +44,10 @@ "id": 10007, "attackWay": "Normal", "attackArgs": [] + }, + { + "id": 170001, + "attackWay": "Normal", + "attackArgs": [] } ] \ No newline at end of file diff --git a/JisolGameCocos/assets/resources/config/json/tbgsysdungeon.json b/JisolGameCocos/assets/resources/config/json/tbgsysdungeon.json index 7608bea3..af49d2c1 100644 --- a/JisolGameCocos/assets/resources/config/json/tbgsysdungeon.json +++ b/JisolGameCocos/assets/resources/config/json/tbgsysdungeon.json @@ -1,14 +1,24 @@ [ { "id": 160001, - "name": "钻石副本", + "name": "金币副本", "banner": "", - "tigs": "TbGSysDungeon160001" + "type": "GDungeonMode", + "tigs": "TbGSysDungeon160001", + "consume": { + "id": 90004, + "value": 1 + } }, { "id": 160002, "name": "锻造石副本", "banner": "", - "tigs": "TbGSysDungeon160002" + "type": "GDungeonMode", + "tigs": "TbGSysDungeon160002", + "consume": { + "id": 90005, + "value": 1 + } } ] \ No newline at end of file diff --git a/JisolGameCocos/assets/resources/config/json/tbgsysdungeon160001.json b/JisolGameCocos/assets/resources/config/json/tbgsysdungeon160001.json index 8e38124e..21513a87 100644 --- a/JisolGameCocos/assets/resources/config/json/tbgsysdungeon160001.json +++ b/JisolGameCocos/assets/resources/config/json/tbgsysdungeon160001.json @@ -3,7 +3,7 @@ "id": 1, "data": { "level": 1, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -26,7 +26,7 @@ "id": 2, "data": { "level": 2, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -49,7 +49,7 @@ "id": 3, "data": { "level": 3, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -72,7 +72,7 @@ "id": 4, "data": { "level": 4, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -95,7 +95,7 @@ "id": 5, "data": { "level": 5, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -118,7 +118,7 @@ "id": 6, "data": { "level": 6, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -141,7 +141,7 @@ "id": 7, "data": { "level": 7, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -164,7 +164,7 @@ "id": 8, "data": { "level": 8, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -187,7 +187,7 @@ "id": 9, "data": { "level": 9, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -210,7 +210,7 @@ "id": 10, "data": { "level": 10, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -233,7 +233,7 @@ "id": 11, "data": { "level": 11, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -256,7 +256,7 @@ "id": 12, "data": { "level": 12, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -279,7 +279,7 @@ "id": 13, "data": { "level": 13, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -302,7 +302,7 @@ "id": 14, "data": { "level": 14, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -325,7 +325,7 @@ "id": 15, "data": { "level": 15, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -348,7 +348,7 @@ "id": 16, "data": { "level": 16, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -371,7 +371,7 @@ "id": 17, "data": { "level": 17, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -394,7 +394,7 @@ "id": 18, "data": { "level": 18, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -417,7 +417,7 @@ "id": 19, "data": { "level": 19, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -440,7 +440,7 @@ "id": 20, "data": { "level": 20, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -463,7 +463,7 @@ "id": 21, "data": { "level": 21, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -486,7 +486,7 @@ "id": 22, "data": { "level": 22, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -509,7 +509,7 @@ "id": 23, "data": { "level": 23, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -532,7 +532,7 @@ "id": 24, "data": { "level": 24, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -555,7 +555,7 @@ "id": 25, "data": { "level": 25, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -578,7 +578,7 @@ "id": 26, "data": { "level": 26, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -601,7 +601,7 @@ "id": 27, "data": { "level": 27, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -624,7 +624,7 @@ "id": 28, "data": { "level": 28, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -647,7 +647,7 @@ "id": 29, "data": { "level": 29, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -670,7 +670,7 @@ "id": 30, "data": { "level": 30, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -693,7 +693,7 @@ "id": 31, "data": { "level": 31, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -716,7 +716,7 @@ "id": 32, "data": { "level": 32, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -739,7 +739,7 @@ "id": 33, "data": { "level": 33, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -762,7 +762,7 @@ "id": 34, "data": { "level": 34, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -785,7 +785,7 @@ "id": 35, "data": { "level": 35, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -808,7 +808,7 @@ "id": 36, "data": { "level": 36, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -831,7 +831,7 @@ "id": 37, "data": { "level": 37, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -854,7 +854,7 @@ "id": 38, "data": { "level": 38, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -877,7 +877,7 @@ "id": 39, "data": { "level": 39, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -900,7 +900,7 @@ "id": 40, "data": { "level": 40, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -923,7 +923,7 @@ "id": 41, "data": { "level": 41, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -946,7 +946,7 @@ "id": 42, "data": { "level": 42, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -969,7 +969,7 @@ "id": 43, "data": { "level": 43, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -992,7 +992,7 @@ "id": 44, "data": { "level": 44, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1015,7 +1015,7 @@ "id": 45, "data": { "level": 45, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1038,7 +1038,7 @@ "id": 46, "data": { "level": 46, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1061,7 +1061,7 @@ "id": 47, "data": { "level": 47, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1084,7 +1084,7 @@ "id": 48, "data": { "level": 48, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1107,7 +1107,7 @@ "id": 49, "data": { "level": 49, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1130,7 +1130,7 @@ "id": 50, "data": { "level": 50, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1153,7 +1153,7 @@ "id": 51, "data": { "level": 51, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1176,7 +1176,7 @@ "id": 52, "data": { "level": 52, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1199,7 +1199,7 @@ "id": 53, "data": { "level": 53, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1222,7 +1222,7 @@ "id": 54, "data": { "level": 54, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1245,7 +1245,7 @@ "id": 55, "data": { "level": 55, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1268,7 +1268,7 @@ "id": 56, "data": { "level": 56, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1291,7 +1291,7 @@ "id": 57, "data": { "level": 57, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1314,7 +1314,7 @@ "id": 58, "data": { "level": 58, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1337,7 +1337,7 @@ "id": 59, "data": { "level": 59, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1360,7 +1360,7 @@ "id": 60, "data": { "level": 60, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1383,7 +1383,7 @@ "id": 61, "data": { "level": 61, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1406,7 +1406,7 @@ "id": 62, "data": { "level": 62, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1429,7 +1429,7 @@ "id": 63, "data": { "level": 63, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1452,7 +1452,7 @@ "id": 64, "data": { "level": 64, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1475,7 +1475,7 @@ "id": 65, "data": { "level": 65, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1498,7 +1498,7 @@ "id": 66, "data": { "level": 66, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1521,7 +1521,7 @@ "id": 67, "data": { "level": 67, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1544,7 +1544,7 @@ "id": 68, "data": { "level": 68, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1567,7 +1567,7 @@ "id": 69, "data": { "level": 69, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1590,7 +1590,7 @@ "id": 70, "data": { "level": 70, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1613,7 +1613,7 @@ "id": 71, "data": { "level": 71, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1636,7 +1636,7 @@ "id": 72, "data": { "level": 72, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1659,7 +1659,7 @@ "id": 73, "data": { "level": 73, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1682,7 +1682,7 @@ "id": 74, "data": { "level": 74, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1705,7 +1705,7 @@ "id": 75, "data": { "level": 75, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1728,7 +1728,7 @@ "id": 76, "data": { "level": 76, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1751,7 +1751,7 @@ "id": 77, "data": { "level": 77, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1774,7 +1774,7 @@ "id": 78, "data": { "level": 78, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1797,7 +1797,7 @@ "id": 79, "data": { "level": 79, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1820,7 +1820,7 @@ "id": 80, "data": { "level": 80, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1843,7 +1843,7 @@ "id": 81, "data": { "level": 81, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1866,7 +1866,7 @@ "id": 82, "data": { "level": 82, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1889,7 +1889,7 @@ "id": 83, "data": { "level": 83, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1912,7 +1912,7 @@ "id": 84, "data": { "level": 84, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1935,7 +1935,7 @@ "id": 85, "data": { "level": 85, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1958,7 +1958,7 @@ "id": 86, "data": { "level": 86, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1981,7 +1981,7 @@ "id": 87, "data": { "level": 87, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2004,7 +2004,7 @@ "id": 88, "data": { "level": 88, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2027,7 +2027,7 @@ "id": 89, "data": { "level": 89, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2050,7 +2050,7 @@ "id": 90, "data": { "level": 90, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2073,7 +2073,7 @@ "id": 91, "data": { "level": 91, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2096,7 +2096,7 @@ "id": 92, "data": { "level": 92, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2119,7 +2119,7 @@ "id": 93, "data": { "level": 93, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2142,7 +2142,7 @@ "id": 94, "data": { "level": 94, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2165,7 +2165,7 @@ "id": 95, "data": { "level": 95, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2188,7 +2188,7 @@ "id": 96, "data": { "level": 96, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2211,7 +2211,7 @@ "id": 97, "data": { "level": 97, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2234,7 +2234,7 @@ "id": 98, "data": { "level": 98, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2257,7 +2257,7 @@ "id": 99, "data": { "level": 99, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2280,7 +2280,7 @@ "id": 100, "data": { "level": 100, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, diff --git a/JisolGameCocos/assets/resources/config/json/tbgsysdungeon160001.json.meta b/JisolGameCocos/assets/resources/config/json/tbgsysdungeon160001.json.meta new file mode 100644 index 00000000..a351d7ce --- /dev/null +++ b/JisolGameCocos/assets/resources/config/json/tbgsysdungeon160001.json.meta @@ -0,0 +1,11 @@ +{ + "ver": "2.0.1", + "importer": "json", + "imported": true, + "uuid": "4f061e23-46ea-4746-ab35-881362890af3", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/resources/config/json/tbgsysdungeon160002.json b/JisolGameCocos/assets/resources/config/json/tbgsysdungeon160002.json index d80b33a3..796eb989 100644 --- a/JisolGameCocos/assets/resources/config/json/tbgsysdungeon160002.json +++ b/JisolGameCocos/assets/resources/config/json/tbgsysdungeon160002.json @@ -3,7 +3,7 @@ "id": 1, "data": { "level": 1, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -26,7 +26,7 @@ "id": 2, "data": { "level": 2, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -49,7 +49,7 @@ "id": 3, "data": { "level": 3, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -72,7 +72,7 @@ "id": 4, "data": { "level": 4, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -95,7 +95,7 @@ "id": 5, "data": { "level": 5, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -118,7 +118,7 @@ "id": 6, "data": { "level": 6, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -141,7 +141,7 @@ "id": 7, "data": { "level": 7, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -164,7 +164,7 @@ "id": 8, "data": { "level": 8, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -187,7 +187,7 @@ "id": 9, "data": { "level": 9, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -210,7 +210,7 @@ "id": 10, "data": { "level": 10, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -233,7 +233,7 @@ "id": 11, "data": { "level": 11, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -256,7 +256,7 @@ "id": 12, "data": { "level": 12, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -279,7 +279,7 @@ "id": 13, "data": { "level": 13, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -302,7 +302,7 @@ "id": 14, "data": { "level": 14, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -325,7 +325,7 @@ "id": 15, "data": { "level": 15, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -348,7 +348,7 @@ "id": 16, "data": { "level": 16, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -371,7 +371,7 @@ "id": 17, "data": { "level": 17, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -394,7 +394,7 @@ "id": 18, "data": { "level": 18, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -417,7 +417,7 @@ "id": 19, "data": { "level": 19, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -440,7 +440,7 @@ "id": 20, "data": { "level": 20, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -463,7 +463,7 @@ "id": 21, "data": { "level": 21, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -486,7 +486,7 @@ "id": 22, "data": { "level": 22, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -509,7 +509,7 @@ "id": 23, "data": { "level": 23, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -532,7 +532,7 @@ "id": 24, "data": { "level": 24, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -555,7 +555,7 @@ "id": 25, "data": { "level": 25, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -578,7 +578,7 @@ "id": 26, "data": { "level": 26, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -601,7 +601,7 @@ "id": 27, "data": { "level": 27, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -624,7 +624,7 @@ "id": 28, "data": { "level": 28, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -647,7 +647,7 @@ "id": 29, "data": { "level": 29, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -670,7 +670,7 @@ "id": 30, "data": { "level": 30, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -693,7 +693,7 @@ "id": 31, "data": { "level": 31, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -716,7 +716,7 @@ "id": 32, "data": { "level": 32, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -739,7 +739,7 @@ "id": 33, "data": { "level": 33, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -762,7 +762,7 @@ "id": 34, "data": { "level": 34, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -785,7 +785,7 @@ "id": 35, "data": { "level": 35, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -808,7 +808,7 @@ "id": 36, "data": { "level": 36, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -831,7 +831,7 @@ "id": 37, "data": { "level": 37, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -854,7 +854,7 @@ "id": 38, "data": { "level": 38, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -877,7 +877,7 @@ "id": 39, "data": { "level": 39, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -900,7 +900,7 @@ "id": 40, "data": { "level": 40, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -923,7 +923,7 @@ "id": 41, "data": { "level": 41, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -946,7 +946,7 @@ "id": 42, "data": { "level": 42, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -969,7 +969,7 @@ "id": 43, "data": { "level": 43, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -992,7 +992,7 @@ "id": 44, "data": { "level": 44, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1015,7 +1015,7 @@ "id": 45, "data": { "level": 45, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1038,7 +1038,7 @@ "id": 46, "data": { "level": 46, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1061,7 +1061,7 @@ "id": 47, "data": { "level": 47, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1084,7 +1084,7 @@ "id": 48, "data": { "level": 48, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1107,7 +1107,7 @@ "id": 49, "data": { "level": 49, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1130,7 +1130,7 @@ "id": 50, "data": { "level": 50, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1153,7 +1153,7 @@ "id": 51, "data": { "level": 51, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1176,7 +1176,7 @@ "id": 52, "data": { "level": 52, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1199,7 +1199,7 @@ "id": 53, "data": { "level": 53, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1222,7 +1222,7 @@ "id": 54, "data": { "level": 54, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1245,7 +1245,7 @@ "id": 55, "data": { "level": 55, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1268,7 +1268,7 @@ "id": 56, "data": { "level": 56, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1291,7 +1291,7 @@ "id": 57, "data": { "level": 57, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1314,7 +1314,7 @@ "id": 58, "data": { "level": 58, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1337,7 +1337,7 @@ "id": 59, "data": { "level": 59, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1360,7 +1360,7 @@ "id": 60, "data": { "level": 60, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1383,7 +1383,7 @@ "id": 61, "data": { "level": 61, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1406,7 +1406,7 @@ "id": 62, "data": { "level": 62, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1429,7 +1429,7 @@ "id": 63, "data": { "level": 63, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1452,7 +1452,7 @@ "id": 64, "data": { "level": 64, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1475,7 +1475,7 @@ "id": 65, "data": { "level": 65, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1498,7 +1498,7 @@ "id": 66, "data": { "level": 66, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1521,7 +1521,7 @@ "id": 67, "data": { "level": 67, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1544,7 +1544,7 @@ "id": 68, "data": { "level": 68, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1567,7 +1567,7 @@ "id": 69, "data": { "level": 69, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1590,7 +1590,7 @@ "id": 70, "data": { "level": 70, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1613,7 +1613,7 @@ "id": 71, "data": { "level": 71, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1636,7 +1636,7 @@ "id": 72, "data": { "level": 72, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1659,7 +1659,7 @@ "id": 73, "data": { "level": 73, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1682,7 +1682,7 @@ "id": 74, "data": { "level": 74, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1705,7 +1705,7 @@ "id": 75, "data": { "level": 75, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1728,7 +1728,7 @@ "id": 76, "data": { "level": 76, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1751,7 +1751,7 @@ "id": 77, "data": { "level": 77, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1774,7 +1774,7 @@ "id": 78, "data": { "level": 78, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1797,7 +1797,7 @@ "id": 79, "data": { "level": 79, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1820,7 +1820,7 @@ "id": 80, "data": { "level": 80, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1843,7 +1843,7 @@ "id": 81, "data": { "level": 81, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1866,7 +1866,7 @@ "id": 82, "data": { "level": 82, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1889,7 +1889,7 @@ "id": 83, "data": { "level": 83, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1912,7 +1912,7 @@ "id": 84, "data": { "level": 84, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1935,7 +1935,7 @@ "id": 85, "data": { "level": 85, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1958,7 +1958,7 @@ "id": 86, "data": { "level": 86, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1981,7 +1981,7 @@ "id": 87, "data": { "level": 87, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2004,7 +2004,7 @@ "id": 88, "data": { "level": 88, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2027,7 +2027,7 @@ "id": 89, "data": { "level": 89, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2050,7 +2050,7 @@ "id": 90, "data": { "level": 90, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2073,7 +2073,7 @@ "id": 91, "data": { "level": 91, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2096,7 +2096,7 @@ "id": 92, "data": { "level": 92, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2119,7 +2119,7 @@ "id": 93, "data": { "level": 93, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2142,7 +2142,7 @@ "id": 94, "data": { "level": 94, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2165,7 +2165,7 @@ "id": 95, "data": { "level": 95, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2188,7 +2188,7 @@ "id": 96, "data": { "level": 96, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2211,7 +2211,7 @@ "id": 97, "data": { "level": 97, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2234,7 +2234,7 @@ "id": 98, "data": { "level": 98, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2257,7 +2257,7 @@ "id": 99, "data": { "level": 99, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2280,7 +2280,7 @@ "id": 100, "data": { "level": 100, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, diff --git a/JisolGameCocos/assets/resources/config/json/tbgsysdungeon160002.json.meta b/JisolGameCocos/assets/resources/config/json/tbgsysdungeon160002.json.meta new file mode 100644 index 00000000..4ca4590e --- /dev/null +++ b/JisolGameCocos/assets/resources/config/json/tbgsysdungeon160002.json.meta @@ -0,0 +1,11 @@ +{ + "ver": "2.0.1", + "importer": "json", + "imported": true, + "uuid": "b9ca35b8-a472-4ba8-bc7c-a19a140a4c73", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/resources/prefab/battle/mode/GDungeonMode.prefab b/JisolGameCocos/assets/resources/prefab/battle/mode/GDungeonMode.prefab new file mode 100644 index 00000000..86750632 --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/battle/mode/GDungeonMode.prefab @@ -0,0 +1,565 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "GDungeonMode", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "GDungeonMode", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + }, + { + "__id__": 8 + }, + { + "__id__": 14 + }, + { + "__id__": 20 + } + ], + "_active": true, + "_components": [ + { + "__id__": 24 + }, + { + "__id__": 26 + } + ], + "_prefab": { + "__id__": 28 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "map3", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 3 + }, + { + "__id__": 5 + } + ], + "_prefab": { + "__id__": 7 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1bc4yeTedDaotqIZIiO62p" + }, + { + "__type__": "0dd9fmWmbBAra4y0n8wnsva", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 6 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "20DqQdn2RLYYhgTzqQbvqY" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "39bav/cE1PmLEj5YR2N1ZZ", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "map2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 9 + }, + { + "__id__": 11 + } + ], + "_prefab": { + "__id__": 13 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 10 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2frjnRjdpF2YGx5+xg+qHO" + }, + { + "__type__": "0dd9fmWmbBAra4y0n8wnsva", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7cBroenCBJ/opob0jtjJuN" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "8999+3ds9PDLLFh+SeJoMh", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "map1", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 15 + }, + { + "__id__": 17 + } + ], + "_prefab": { + "__id__": 19 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 16 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "73Zql/5spAq5MK9cva+AXA" + }, + { + "__type__": "0dd9fmWmbBAra4y0n8wnsva", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 18 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8ck9vXBiFC8Jmwj/4+fJeh" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "26UVXGn2pD27pZYKj87yDp", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "objects", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 21 + } + ], + "_prefab": { + "__id__": 23 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 20 + }, + "_enabled": true, + "__prefab": { + "__id__": 22 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ab/o6YLntOsqtrgbUYd8/8" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "26pTDLadlMBa4Emx8+EIwd", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 25 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "36KI0wow1LqrcICgBTdo4H" + }, + { + "__type__": "202e1qe+r9BLYGNabThPI1f", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 27 + }, + "map1": { + "__id__": 17 + }, + "map2": { + "__id__": 11 + }, + "map3": { + "__id__": 5 + }, + "playerPrefab": { + "__uuid__": "e989c288-5957-41c1-953c-190622651f52", + "__expectedType__": "cc.Prefab" + }, + "enemyPrefab": { + "__uuid__": "e989c288-5957-41c1-953c-190622651f52", + "__expectedType__": "cc.Prefab" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "32wle75g5Jy7AVnHVBKY7u" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "073cpMY+ZFPqtOHf+oOHD6", + "instance": null, + "targetOverrides": null + } +] \ No newline at end of file diff --git a/JisolGameCocos/assets/resources/prefab/battle/mode/GDungeonMode.prefab.meta b/JisolGameCocos/assets/resources/prefab/battle/mode/GDungeonMode.prefab.meta new file mode 100644 index 00000000..477be743 --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/battle/mode/GDungeonMode.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.49", + "importer": "prefab", + "imported": true, + "uuid": "8f463b64-9907-4670-9316-dabccb947cb4", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "GDungeonMode" + } +} diff --git a/JisolGameCocos/assets/resources/prefab/battle/mode/GOnHookMode.prefab b/JisolGameCocos/assets/resources/prefab/battle/mode/GOnHookMode.prefab index 52d35779..ba0a9131 100644 --- a/JisolGameCocos/assets/resources/prefab/battle/mode/GOnHookMode.prefab +++ b/JisolGameCocos/assets/resources/prefab/battle/mode/GOnHookMode.prefab @@ -527,10 +527,6 @@ "__prefab": { "__id__": 27 }, - "rolePrefab": { - "__uuid__": "e989c288-5957-41c1-953c-190622651f52", - "__expectedType__": "cc.Prefab" - }, "map1": { "__id__": 17 }, @@ -540,6 +536,14 @@ "map3": { "__id__": 5 }, + "playerPrefab": { + "__uuid__": "e989c288-5957-41c1-953c-190622651f52", + "__expectedType__": "cc.Prefab" + }, + "enemyPrefab": { + "__uuid__": "e989c288-5957-41c1-953c-190622651f52", + "__expectedType__": "cc.Prefab" + }, "objects": { "__id__": 20 }, diff --git a/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab b/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab index dfc7c9b8..ef31097e 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab @@ -8723,7 +8723,7 @@ "b": 255, "a": 255 }, - "_string": "公会", + "_string": "背包", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 24, diff --git a/JisolGameCocos/assets/resources/prefab/ui/副本页面/副本展示节点.prefab b/JisolGameCocos/assets/resources/prefab/ui/副本页面/副本展示节点.prefab index c4d40baf..f359040a 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/副本页面/副本展示节点.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/副本页面/副本展示节点.prefab @@ -28,17 +28,17 @@ "_active": true, "_components": [ { - "__id__": 26 + "__id__": 27 }, { - "__id__": 28 + "__id__": 29 }, { - "__id__": 30 + "__id__": 31 } ], "_prefab": { - "__id__": 32 + "__id__": 33 }, "_lpos": { "__type__": "cc.Vec3", @@ -260,7 +260,7 @@ } ], "_prefab": { - "__id__": 25 + "__id__": 26 }, "_lpos": { "__type__": "cc.Vec3", @@ -541,7 +541,11 @@ "__prefab": { "__id__": 24 }, - "clickEvents": [], + "clickEvents": [ + { + "__id__": 25 + } + ], "_interactable": true, "_transition": 3, "_normalColor": { @@ -587,6 +591,16 @@ "__type__": "cc.CompPrefabInfo", "fileId": "3aBwLMe2dMPZR18jNcYNNR" }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "337e3LHVYBIl5JbGd62Yh00", + "handler": "onClickDungeon", + "customEventData": "" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -610,7 +624,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 27 + "__id__": 28 }, "_contentSize": { "__type__": "cc.Size", @@ -638,7 +652,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 29 + "__id__": 30 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -683,7 +697,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 32 }, "title": { "__id__": 5 diff --git a/JisolGameCocos/assets/script/battle/GBattleModeManager.ts b/JisolGameCocos/assets/script/battle/GBattleModeManager.ts index 7f8a8b9c..07b484da 100644 --- a/JisolGameCocos/assets/script/battle/GBattleModeManager.ts +++ b/JisolGameCocos/assets/script/battle/GBattleModeManager.ts @@ -11,13 +11,13 @@ import BattleResource from "../tools/BattleResource"; export enum BattleMode{ //无尽模式 - OnHook = "OnHook", + OnHook = 0, //PVP 模式 - PVP = "PVP", + PVP = 1, //阵营守护 - CampGuardian = "CampGuardian", + CampGuardian = 2, //副本 - GDungeonMode = "GDungeonMode", + GDungeonMode = 3, } export interface GBattleModeInfo{ @@ -102,6 +102,7 @@ export default class GBattleModeManager extends Singleton { } this.current = mode; + this.data = data; this.Close(); this.current = mode; this.data = data; diff --git a/JisolGameCocos/assets/script/battle/base/role/CampGuardian/GRoleCGCrystal.ts b/JisolGameCocos/assets/script/battle/base/role/CampGuardian/GRoleCGCrystal.ts index d1595147..01b75588 100644 --- a/JisolGameCocos/assets/script/battle/base/role/CampGuardian/GRoleCGCrystal.ts +++ b/JisolGameCocos/assets/script/battle/base/role/CampGuardian/GRoleCGCrystal.ts @@ -1,12 +1,9 @@ import { _decorator } from "cc"; -import GFSMDefault from "../../fsm/Default/GFSMDefault"; -import { GFSMDefaultAnim } from "../../fsm/Default/GFSMDefaultAnim"; import { GFSMAnimBase } from "../../fsm/GFSMAnimBase"; import GFSMBase from "../../fsm/GFSMBase"; import GRoleBase from "../GRoleBase"; import { ProgressBar } from "cc"; import { TB } from "../../../../config/data/schema"; -import { GPetAminEnum } from "../../anim/GPetAnim"; import { v3 } from "cc"; import GFSMCampGuardianAnim from "../../fsm/CampGuardian/GFSMCampGuardianAnim"; const { property,ccclass } = _decorator; diff --git a/JisolGameCocos/assets/script/battle/base/role/GRoleBase.ts b/JisolGameCocos/assets/script/battle/base/role/GRoleBase.ts index 9ff670d9..198b000c 100644 --- a/JisolGameCocos/assets/script/battle/base/role/GRoleBase.ts +++ b/JisolGameCocos/assets/script/battle/base/role/GRoleBase.ts @@ -113,6 +113,7 @@ export default abstract class GRoleBase extends GObject{ public init(role:TB.TbGRole){ console.log("初始化宠物",!!this.spine,!!(app.battleRes.getRoleSpine(role.id))); this.spine.skeletonData = app.battleRes.getRoleSpine(role.id); + this.node.scale = v3(role.roleScale,role.roleScale,role.roleScale); } //创建一个状态机 diff --git a/JisolGameCocos/assets/script/battle/base/values/GAttributeData.ts b/JisolGameCocos/assets/script/battle/base/values/GAttributeData.ts index c38940f0..5081b105 100644 --- a/JisolGameCocos/assets/script/battle/base/values/GAttributeData.ts +++ b/JisolGameCocos/assets/script/battle/base/values/GAttributeData.ts @@ -1,7 +1,9 @@ import { TD, app } from "../../../App"; +import { TbGEntity } from "../../../config/data/schema"; import { PetEquip, PlayerPetOV } from "../../../consts/API"; import GRoleValues from "./GRoleValues"; import GAttribute from "./attribute/GAttribute"; +import GDefaultAttribute from "./attribute/default/GDefaultAttribute"; import GPetAttribute from "./attribute/role/GPetAttribute"; import GPetEquipAttribute from "./attribute/role/GPetEquipAttribute"; @@ -84,4 +86,13 @@ export default class GAttributeData{ } + //根据属性返回属性 + static TAttributeValue(info:TbGEntity.TAttributeValue[]){ + + let value = new GAttribute(); + value.add(new GDefaultAttribute().set(info)) + return value; + + } + } \ No newline at end of file diff --git a/JisolGameCocos/assets/script/battle/base/values/attribute/default.meta b/JisolGameCocos/assets/script/battle/base/values/attribute/default.meta new file mode 100644 index 00000000..5b3a82c5 --- /dev/null +++ b/JisolGameCocos/assets/script/battle/base/values/attribute/default.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "a5050452-3587-4ccd-a324-f7e7e1fb9cce", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/script/battle/base/values/attribute/default/GDefaultAttribute.ts b/JisolGameCocos/assets/script/battle/base/values/attribute/default/GDefaultAttribute.ts new file mode 100644 index 00000000..6359819e --- /dev/null +++ b/JisolGameCocos/assets/script/battle/base/values/attribute/default/GDefaultAttribute.ts @@ -0,0 +1,24 @@ +import { TD } from "../../../../../App"; +import { TbGEntity } from "../../../../../config/data/schema"; +import GAttributeBase from "../GAttributeBase"; + +//默认属性 +export default class GDefaultAttribute extends GAttributeBase{ + + update() { } + + set(info:TbGEntity.TAttributeValue[]){ + this.attributes = {}; + + //获取全部属性信息 + TD.TbGAttribute.getDataList().forEach(attr => { + //默认 0 + this.attributes[attr.id] = 0; + }); + + info.forEach(item => this.attributes[item.id] += item.value); + + return this; + } + +} \ No newline at end of file diff --git a/JisolGameCocos/assets/script/battle/base/values/attribute/default/GDefaultAttribute.ts.meta b/JisolGameCocos/assets/script/battle/base/values/attribute/default/GDefaultAttribute.ts.meta new file mode 100644 index 00000000..f87300d6 --- /dev/null +++ b/JisolGameCocos/assets/script/battle/base/values/attribute/default/GDefaultAttribute.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "770fb39c-b04f-4c1c-9dff-105f01b099f6", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/script/battle/modes/GDungeonMode.ts b/JisolGameCocos/assets/script/battle/modes/GDungeonMode.ts index eaa9a460..12291154 100644 --- a/JisolGameCocos/assets/script/battle/modes/GDungeonMode.ts +++ b/JisolGameCocos/assets/script/battle/modes/GDungeonMode.ts @@ -1,105 +1,75 @@ import { _decorator } from "cc"; -import GBaseMode from "../GBaseMode"; import { TB, TbGEntity } from "../../config/data/schema"; +import GNormalModeBase, { GNormalModePlayerEnum } from "./default/GNormalModeBase"; +import { TD, app } from "../../App"; +import GOnHookData from "../../data/GOnHookData"; import PlayerTacticalData from "../../data/PlayerTacticalData"; import PlayerPetData from "../../data/PlayerPetData"; -import { TD, app } from "../../App"; import { GUI } from "../../ui/UIConfig"; -import { GOnHookModePlayerEnum } from "./GOnHookMode"; -import GRoleDefault from "../base/role/GRoleDefault"; +import GBattleData from "../../data/GBattleData"; +import GAttributeData from "../base/values/GAttributeData"; +import JNFrameTime from "../../../../extensions/ngame/assets/ngame/sync/frame/game/time/JNFrameTime"; const { ccclass, property } = _decorator; - -//角色 -export enum GDungeonModeEnum{ - PLAYER, //玩家 - ENEMY, //怪物 -} - /** * 副本(默认) 模式 */ @ccclass('GDungeonMode') -export default class GDungeonMode extends GBaseMode<{},TbGEntity.TDungeon>{ +export default class GDungeonMode extends GNormalModeBase<{},TbGEntity.TDungeon>{ + onSyncInitSuccess(){ + if(!this.data) return; - //生成玩家宠物 - onGenPlayerPet(index:number,petId:number){ + console.log("初始化 GDungeonMode 模式",this.data); + super.onSyncInitSuccess(); + this.onUpdateWorld(); + //生成玩家宠物 + this.onGenPlayerPet(); + //生成Boss + this.onGenBoss(); + } + + //更新地图 + onUpdateWorld(){ + let info = TD.TbGOnHookMaps.get(GOnHookData.getIns().info.onHookMap); + this.setWorldMap(info.mapId); + } + + onGenPlayerPet(){ //获取玩家阵容 let infos = PlayerTacticalData.getIns().getTacticalInfo(); - infos.forEach(petId => { + infos.forEach((petId,index) => { + if(!petId) return; //获取要生成的宠物 let info = PlayerPetData.getIns().petIdQueryPetInfo(petId); - if(!info){ app.layer.Open(GUI.Tips,{text:"未拥有当前上阵的宠物"}); return; } - - let role = this.onGenRole(GOnHookModePlayerEnum.PLAYER,index,TD.TbGRole.get(info.petTbId)); + let role = this.onGenRole(GNormalModePlayerEnum.PLAYER,index + 1,TD.TbGRole.get(info.petTbId)); + + //添加宠物属性 + role.onEffectiveValue(GBattleData.getIns().data.getPetAttribute(petId)); }) - //如果场上有这个宠物则更新阵法位置 - let passRole:GRoleDefault; - this.playerRoles.forEach(role => { - if(role.getComponent(GRoleOnHookPlayerExpand).petId == petId) - passRole = role; - }) - if(passRole){ - //更新宠物阵法位置 - passRole.tacticalIndex = index; - return; - } - - - if(!info){ - app.layer.Open(GUI.Tips,{text:"未拥有当前上阵的宠物"}); - return; - } - let role = this.onGenRole(GOnHookModePlayerEnum.PLAYER,index,TD.TbGRole.get(info.petTbId)); - //向宠物添加 OnHook 扩展 - let expand = role.node.addComponent(GRoleOnHookPlayerExpand); - expand.petId = petId; - - //添加宠物属性 - role.onEffectiveValue(GBattleData.getIns().data.getPetAttribute(petId)); - } - //生成宠物 - onGenRole(type: GOnHookModePlayerEnum,index:number,info:TB.TbGRole):GRoleDefault { - - let tactical = this.getInfo(type).tactical; - let pos:Vec2 = this.getInfo(type).tactical.getPosition(index); - if(!pos) return; - let role = instantiate(this.rolePrefab); - - let entity = role.getComponent(GRoleDefault); - //初始化 - entity.onInit(type,info,tactical,index); - - //绑定寻敌 - entity.onQueryEunmy = () => { - return this.getEnumy(entity,type); - } - - //绑定死亡回调 - entity.addKillBackEvent(this.onRoleKillBack.bind(this)) - //绑定受击回调 - entity.addHitCallback(this.onHitBack.bind(this)); - - this.addGObject(entity,tactical.getPosition(index)); - - this.getOnesRole(type).push(entity); - - return entity; - + onGenBoss(){ + let enemy = this.onGenRole(GNormalModePlayerEnum.ENEMY,5,TD.TbGRole.get(this.data.boss)); + enemy.onEffectiveValue(GAttributeData.TAttributeValue(this.data.attributes)) } + //战斗结束 + onBattleEnd(win:GNormalModePlayerEnum){ + //结束游戏 + JNFrameTime.getInstance().setTimeout(() => { + this.Close(); + },3000) + } } diff --git a/JisolGameCocos/assets/script/battle/modes/GDungeonMode.ts.meta b/JisolGameCocos/assets/script/battle/modes/GDungeonMode.ts.meta new file mode 100644 index 00000000..fd992f54 --- /dev/null +++ b/JisolGameCocos/assets/script/battle/modes/GDungeonMode.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "202e1a9e-fabf-412d-818d-69b4e13c8d5f", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/script/battle/modes/GOnHookMode.ts b/JisolGameCocos/assets/script/battle/modes/GOnHookMode.ts index 63eef912..e6d553e8 100644 --- a/JisolGameCocos/assets/script/battle/modes/GOnHookMode.ts +++ b/JisolGameCocos/assets/script/battle/modes/GOnHookMode.ts @@ -24,11 +24,10 @@ import { GOnHookPet, GOnHookPets } from "../../../../extensions/ngame/assets/nga import GOnHookManager, { GOnHookManagerEvent } from "../../manager/battle/mode/GOnHookManager"; import GRoleOnHookCreepsExpand from "../base/role/expand/OnHook/GRoleOnHookCreepsExpand"; import GPetAttribute from "../base/values/attribute/role/GPetAttribute"; -import GDefaultMode from "./default/GDefaultMode"; import GOnHookData from "../../data/GOnHookData"; import { GModeEvent, GModeHitInfo } from "./GMode"; -import GAttributeData from "../base/values/GAttributeData"; import GBattleData, { GBattleDataEnum } from "../../data/GBattleData"; +import GNormalModeBase, { GNormalModePlayerEnum } from "./default/GNormalModeBase"; const { ccclass, property } = _decorator; //挂机模式状态 @@ -38,26 +37,11 @@ export enum GOnHookModeState{ AttackEnd, //攻击结束 } -//角色 -export enum GOnHookModePlayerEnum{ - PLAYER, //玩家 - ENEMY, //怪物 -} - -//玩家信息 -export interface GOnHookInfo{ - //阵法 - tactical: GTactical; -} - /** * 挂机模式 无限出现小怪 (不是联机模式 该模式支持使用本地数据 和 API) */ @ccclass('GOnHookMode') -export default class GOnHookMode extends GDefaultMode<{},{}>{ - - @property(Prefab) - rolePrefab: Prefab = null; +export default class GOnHookMode extends GNormalModeBase<{},{}>{ @property(Node) objects: Node = null; @@ -65,16 +49,6 @@ export default class GOnHookMode extends GDefaultMode<{},{}>{ get scene():Node{ return this.objects; } - - //玩家信息 - playerInfo:GOnHookInfo; - //宠物信息 - enemyInfo:GOnHookInfo; - - //玩家宠物位置 - playerPos: Vec2 = new Vec2(-400,0); - //怪物位置 - enemyPos: Vec2 = new Vec2(400,0); //玩家宠物 playerRoles: GRoleDefault[] = []; @@ -102,6 +76,9 @@ export default class GOnHookMode extends GDefaultMode<{},{}>{ //是否战斗失败 isFail:boolean = false; + //让胜负失效 + get isEndGame(){return true;} + //添加监听事件 addEvent(){ app.event.on(PlayerTacticalEvent.UPDATE_TACTICAL,this.onUpdatePlayerPet,this); @@ -121,20 +98,13 @@ export default class GOnHookMode extends GDefaultMode<{},{}>{ //初始化战斗 console.log("GOnHookMode 模式初始化"); - //调整相机 - this.camera.enabled = true; - let camreaPos = this.camera.node.worldPosition; - this.camera.node.worldPosition = v3(0,750,camreaPos.z) + super.onSyncInitSuccess(); //初始化状态机 this.fsm = new GFSMOnHookMode(this); //更新场景 this.onUpdateWorld(); - - this.playerInfo = { tactical: GTactical.getTactical().setOffset(this.playerPos) }; - this.enemyInfo = { tactical: GTactical.getTactical(true).setOffset(this.enemyPos) }; - this.onUpdatePlayerPet(); //添加监听 @@ -149,7 +119,7 @@ export default class GOnHookMode extends GDefaultMode<{},{}>{ // }) //生成玩家 - // this.playerInfo.roles.forEach((info,index) => this.onGenRole(GOnHookModePlayerEnum.PLAYER,index + 1,info)) + // this.playerInfo.roles.forEach((info,index) => this.onGenRole(GNormalModePlayerEnum.PLAYER,index + 1,info)) // //生成敌人 // this.onResetGenerateEnemy(); @@ -173,7 +143,7 @@ export default class GOnHookMode extends GDefaultMode<{},{}>{ let infos = PlayerTacticalData.getIns().getTacticalInfo(); //移除不再阵容中的宠物 - let roles = [...this.getOnesRoleAlive(GOnHookModePlayerEnum.PLAYER)] + let roles = [...this.getOnesRoleAlive(GNormalModePlayerEnum.PLAYER)] roles.forEach(role => { let expand = role.getComponent(GRoleOnHookPlayerExpand); //如果宠物不再阵容中 则 移除宠物 @@ -195,7 +165,7 @@ export default class GOnHookMode extends GDefaultMode<{},{}>{ //更新属性 onUpdateAttribute(){ - this.getOnesRole(GOnHookModePlayerEnum.PLAYER).forEach(pet => { + this.getOnesRole(GNormalModePlayerEnum.PLAYER).forEach(pet => { pet.onEffectiveValue(GBattleData.getIns().data.getPetAttribute(pet.getComponent(GRoleOnHookPlayerExpand).petId)); }); @@ -221,7 +191,7 @@ export default class GOnHookMode extends GDefaultMode<{},{}>{ }else{ //获取冲到最前面的宠物 - let roles = this.getOnesRoleAlive(GOnHookModePlayerEnum.PLAYER); + let roles = this.getOnesRoleAlive(GNormalModePlayerEnum.PLAYER); let frontRole = roles.sort((role1,role2) => role2.v2World.x - role1.v2World.x)[0]; if(!frontRole) return; @@ -254,7 +224,7 @@ export default class GOnHookMode extends GDefaultMode<{},{}>{ app.layer.Open(GUI.Tips,{text:"未拥有当前上阵的宠物"}); return; } - let role = this.onGenRole(GOnHookModePlayerEnum.PLAYER,index,TD.TbGRole.get(info.petTbId)); + let role = this.onGenRole(GNormalModePlayerEnum.PLAYER,index,TD.TbGRole.get(info.petTbId)); //向宠物添加 OnHook 扩展 let expand = role.node.addComponent(GRoleOnHookPlayerExpand); expand.petId = petId; @@ -267,7 +237,7 @@ export default class GOnHookMode extends GDefaultMode<{},{}>{ //生成野怪 onGenCreeps(index:number,creeps:GOnHookPet){ - let role = this.onGenRole(GOnHookModePlayerEnum.ENEMY,index,TD.TbGRole.get(creeps.petTbId)); + let role = this.onGenRole(GNormalModePlayerEnum.ENEMY,index,TD.TbGRole.get(creeps.petTbId)); //向野怪添加扩展 let expand = role.node.addComponent(GRoleOnHookCreepsExpand); @@ -285,85 +255,12 @@ export default class GOnHookMode extends GDefaultMode<{},{}>{ } - //生成宠物 - onGenRole(type: GOnHookModePlayerEnum,index:number,info:TB.TbGRole):GRoleDefault { - - let tactical = this.getInfo(type).tactical; - let pos:Vec2 = this.getInfo(type).tactical.getPosition(index); - if(!pos) return; - let role = instantiate(this.rolePrefab); - - let entity = role.getComponent(GRoleDefault); - //初始化 - entity.onInit(type,info,tactical,index); - - //绑定寻敌 - entity.onQueryEunmy = () => { - return this.getEnumy(entity,type); - } - - //绑定死亡回调 - entity.addKillBackEvent(this.onRoleKillBack.bind(this)) - //绑定受击回调 - entity.addHitCallback(this.onHitBack.bind(this)); - - this.addGObject(entity,tactical.getPosition(index)); - - this.getOnesRole(type).push(entity); - - return entity; - - } - - //获取配置 - getInfo(type: GOnHookModePlayerEnum): GOnHookInfo { - if(type == GOnHookModePlayerEnum.PLAYER) return this.playerInfo; - if(type == GOnHookModePlayerEnum.ENEMY) return this.enemyInfo; - } - - //获取阵营宠物 - getOnesRole(type: GOnHookModePlayerEnum):GRoleDefault[]{ - if(type == GOnHookModePlayerEnum.PLAYER) return this.playerRoles; - if(type == GOnHookModePlayerEnum.ENEMY) return this.enemyRoles; - } - - //获取存活的宠物 - getOnesRoleAlive(type: GOnHookModePlayerEnum):GRoleDefault[]{ - if(type == GOnHookModePlayerEnum.PLAYER) return this.playerRoles.filter(role => !!role.get()); - if(type == GOnHookModePlayerEnum.ENEMY) return this.enemyRoles.filter(role => !!role.get()); - } - //获取敌人 - getEnumy(player:GRoleDefault,type:GOnHookModePlayerEnum):GRoleDefault{ + getEnumy(player:GRoleDefault,type:GNormalModePlayerEnum):GRoleDefault{ if(!this.isAllowAttack) return null; - let enumyOnes = GOnHookModePlayerEnum.ENEMY - //如果是ENEMY 则 它的敌人是 PLAYER - if(type == GOnHookModePlayerEnum.ENEMY) enumyOnes = GOnHookModePlayerEnum.PLAYER - - //获取敌人 - let roles = this.getOnesRoleAlive(enumyOnes); - - //通过距离获取最近的敌人 - if(roles[0]){ - let len = Math.abs(Vec2.distance(player.v2World,roles[0].v2World)); - let enumy = roles[0]; - - for (let index = 0; index < roles.length; index++) { - const role = roles[index]; - let tLen; - if(tLen = Math.abs(Vec2.distance(player.v2World,role.v2World)) < len){ - enumy = role; - len = tLen; - } - - } - - return enumy; - }else{ - return null; - } + return super.getEnumy(player,type); } @@ -385,20 +282,13 @@ export default class GOnHookMode extends GDefaultMode<{},{}>{ } this.onUpdatePlayerPet(); - // this.enemyInfo.roles.forEach((info,index) => this.onGenRole(GOnHookModePlayerEnum.ENEMY,index + 1,info)); + // this.enemyInfo.roles.forEach((info,index) => this.onGenRole(GNormalModePlayerEnum.ENEMY,index + 1,info)); } //角色死亡回调 onRoleKillBack(role:GRoleDefault){ - //死亡销毁 - JNFrameTime.getInstance().setTimeout(() => { - if(role.isValid) - role.node.destroy() - else console.log(role,"无法销毁"); - },3000) - - //清理 - this.onClearCache(); + + super.onRoleKillBack(role); //如果死亡的是野怪则通知野怪死亡 if(role.getComponent(GRoleOnHookCreepsExpand)){ @@ -420,22 +310,6 @@ export default class GOnHookMode extends GDefaultMode<{},{}>{ } - //角色受击回调 - onHitBack(role:GRoleDefault,hit:number){ - - if(!role.get()) return; - - //添加受击显示 - app.event.emit(GModeEvent.HIT,{ - mode:this, - role:role, - hit:hit, - world:role.v2World, - camera:this.camera, - }); - - } - //清理缓存 onClearCache(){ @@ -458,7 +332,7 @@ export default class GOnHookMode extends GDefaultMode<{},{}>{ //是否有怪物 isHaveEnemy(){ if(!this.isAllowAttack) return []; - return this.getOnesRoleAlive(GOnHookModePlayerEnum.ENEMY).filter(role => !!role.get()).length > 0; + return this.getOnesRoleAlive(GNormalModePlayerEnum.ENEMY).filter(role => !!role.get()).length > 0; } //前往下一个目标 diff --git a/JisolGameCocos/assets/script/battle/modes/OnHook/GFSMOnHookMode.ts b/JisolGameCocos/assets/script/battle/modes/OnHook/GFSMOnHookMode.ts index 5ef3f1c5..c8dc19c6 100644 --- a/JisolGameCocos/assets/script/battle/modes/OnHook/GFSMOnHookMode.ts +++ b/JisolGameCocos/assets/script/battle/modes/OnHook/GFSMOnHookMode.ts @@ -1,5 +1,6 @@ import GFSMBase, { GFSMProcessEnum, GFSMProcessInfo, GFSMProcessMode } from "../../base/fsm/GFSMBase"; -import GOnHookMode, { GOnHookModePlayerEnum } from "../GOnHookMode"; +import GOnHookMode from "../GOnHookMode"; +import { GNormalModePlayerEnum } from "../default/GNormalModeBase"; //流程枚举 enum ProcessEnum { @@ -88,7 +89,7 @@ export default class GFSMOnHookMode extends GFSMBase{ onLeaveFightProcess(){ //判断玩家是否前往到战斗位置 - let roles = this.mode.getOnesRoleAlive(GOnHookModePlayerEnum.PLAYER); + let roles = this.mode.getOnesRoleAlive(GNormalModePlayerEnum.PLAYER); if(roles.length == 0) return GFSMProcessEnum.Reset; for (let index = 0; index < roles.length; index++) { diff --git a/JisolGameCocos/assets/script/battle/modes/default/GNormalModeBase.ts b/JisolGameCocos/assets/script/battle/modes/default/GNormalModeBase.ts index a1951ca0..379a9667 100644 --- a/JisolGameCocos/assets/script/battle/modes/default/GNormalModeBase.ts +++ b/JisolGameCocos/assets/script/battle/modes/default/GNormalModeBase.ts @@ -1,22 +1,96 @@ +import { Vec2 } from "cc"; import { TB } from "../../../config/data/schema"; import GRoleDefault from "../../base/role/GRoleDefault"; +import { GTactical } from "../../entity/GTactical"; import GDefaultMode from "./GDefaultMode"; +import { instantiate } from "cc"; +import { _decorator } from "cc"; +import { Prefab } from "cc"; +import JNFrameTime from "../../../../../extensions/ngame/assets/ngame/sync/frame/game/time/JNFrameTime"; +import { v3 } from "cc"; +import { GModeEvent } from "../GMode"; +import { app } from "../../../App"; +const { ccclass, property } = _decorator; + //角色 -export enum GNormalModeEnum{ +export enum GNormalModePlayerEnum{ PLAYER, //玩家 ENEMY, //怪物 } -export default class GNormalModeBase extends GDefaultMode<{},{}>{ +export interface GNormalModePlayerInfo{ + //阵法 + tactical: GTactical; +} + +export default class GNormalModeBase extends GDefaultMode{ + + @property(Prefab) + playerPrefab: Prefab = null; + @property(Prefab) + enemyPrefab: Prefab = null; + + //玩家宠物 + playerRoles: GRoleDefault[] = []; + //敌方宠物 + enemyRoles: GRoleDefault[] = []; + + //玩家信息 + playerInfo:GNormalModePlayerInfo; + //宠物信息 + enemyInfo:GNormalModePlayerInfo; + + //玩家宠物位置 + playerPos: Vec2 = new Vec2(-400,0); + //怪物位置 + enemyPos: Vec2 = new Vec2(400,0); + + //是否结束游戏 + _isEndGame:boolean = false; + get isEndGame(){return this._isEndGame;} + set isEndGame(value){this._isEndGame = value} + + onSyncInitSuccess(){ + this.playerInfo = { tactical: GTactical.getTactical().setOffset(this.playerPos) }; + this.enemyInfo = { tactical: GTactical.getTactical(true).setOffset(this.enemyPos) }; + + //调整相机 + this.camera.enabled = true; + let camreaPos = this.camera.node.worldPosition; + this.camera.node.worldPosition = v3(0,750,camreaPos.z) + } + + //获取配置 + getInfo(type: GNormalModePlayerEnum): GNormalModePlayerInfo { + if(type == GNormalModePlayerEnum.PLAYER) return this.playerInfo; + if(type == GNormalModePlayerEnum.ENEMY) return this.enemyInfo; + } + + //获取阵营宠物 + getOnesRole(type: GNormalModePlayerEnum):GRoleDefault[]{ + if(type == GNormalModePlayerEnum.PLAYER) return this.playerRoles; + if(type == GNormalModePlayerEnum.ENEMY) return this.enemyRoles; + } + + //获取存活的宠物 + getOnesRoleAlive(type: GNormalModePlayerEnum):GRoleDefault[]{ + if(type == GNormalModePlayerEnum.PLAYER) return this.playerRoles.filter(role => !!role.get()); + if(type == GNormalModePlayerEnum.ENEMY) return this.enemyRoles.filter(role => !!role.get()); + } + //生成宠物 - onGenRole(type: GNormalModeEnum,index:number,info:TB.TbGRole):GRoleDefault { + onGenRole(type: GNormalModePlayerEnum,index:number,info:TB.TbGRole):GRoleDefault { let tactical = this.getInfo(type).tactical; let pos:Vec2 = this.getInfo(type).tactical.getPosition(index); if(!pos) return; - let role = instantiate(this.rolePrefab); + let role; + if(type == GNormalModePlayerEnum.PLAYER) + role = instantiate(this.playerPrefab); + if(type == GNormalModePlayerEnum.ENEMY) + role = instantiate(this.enemyPrefab); let entity = role.getComponent(GRoleDefault); //初始化 @@ -40,5 +114,102 @@ export default class GNormalModeBase extends GDefaultMode<{},{}>{ } + //获取敌人 + getEnumy(player:GRoleDefault,type:GNormalModePlayerEnum):GRoleDefault{ + + let enumyOnes = GNormalModePlayerEnum.ENEMY + //如果是ENEMY 则 它的敌人是 PLAYER + if(type == GNormalModePlayerEnum.ENEMY) enumyOnes = GNormalModePlayerEnum.PLAYER + + //获取敌人 + let roles = this.getOnesRoleAlive(enumyOnes); + + //通过距离获取最近的敌人 + if(roles[0]){ + let len = Math.abs(Vec2.distance(player.v2World,roles[0].v2World)); + let enumy = roles[0]; + + for (let index = 0; index < roles.length; index++) { + const role = roles[index]; + let tLen; + if(tLen = Math.abs(Vec2.distance(player.v2World,role.v2World)) < len){ + enumy = role; + len = tLen; + } + + } + + return enumy; + }else{ + return null; + } + + } + + //清理缓存 + onClearCache(){ + + //清理宠物 + let roles = [...this.playerRoles]; + roles.forEach(role => { + if(!role.get()){ + this.playerRoles.splice(this.playerRoles.indexOf(role),1); + } + }) + roles = [...this.enemyRoles]; + roles.forEach(role => { + if(!role.get()){ + this.enemyRoles.splice(this.enemyRoles.indexOf(role),1); + } + }) + + } + + //角色死亡回调 + onRoleKillBack(role:GRoleDefault){ + + //死亡销毁 + JNFrameTime.getInstance().setTimeout(() => { + if(role.isValid) + role.node.destroy() + else console.log(role,"无法销毁"); + },3000) + + //清理 + this.onClearCache(); + + //如果任何一方死亡则调用结束 + if(!this.isEndGame){ + if(this.playerRoles.length == 0){ + this.isEndGame = true; + return this.onBattleEnd(GNormalModePlayerEnum.ENEMY) + } + if(this.enemyRoles.length == 0){ + this.isEndGame = true; + return this.onBattleEnd(GNormalModePlayerEnum.PLAYER) + } + } + + } + + //战斗结束(胜利队伍) + onBattleEnd(win:GNormalModePlayerEnum){} + + //角色受击回调 + onHitBack(role:GRoleDefault,hit:number){ + + if(!role.get()) return; + + //添加受击显示 + app.event.emit(GModeEvent.HIT,{ + mode:this, + role:role, + hit:hit, + world:role.v2World, + camera:this.camera, + }); + + } + } diff --git a/JisolGameCocos/assets/script/battle/modes/default/GNormalModeBase.ts.meta b/JisolGameCocos/assets/script/battle/modes/default/GNormalModeBase.ts.meta new file mode 100644 index 00000000..184fb8df --- /dev/null +++ b/JisolGameCocos/assets/script/battle/modes/default/GNormalModeBase.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "596564e1-2c26-46ce-aaa9-d4276bf9a702", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/script/config/data/schema.ts b/JisolGameCocos/assets/script/config/data/schema.ts index aadfc04c..a9772e31 100644 --- a/JisolGameCocos/assets/script/config/data/schema.ts +++ b/JisolGameCocos/assets/script/config/data/schema.ts @@ -61,6 +61,8 @@ export class TbGRole { this.roleAttackRange = _json_.roleAttackRange if (_json_.roleHight === undefined) { throw new Error() } this.roleHight = _json_.roleHight + if (_json_.roleScale === undefined) { throw new Error() } + this.roleScale = _json_.roleScale } /** @@ -87,6 +89,10 @@ export class TbGRole { * 角色高度 */ readonly roleHight: number + /** + * 宠物默认缩放 + */ + readonly roleScale: number resolve(tables:Tables) { @@ -928,8 +934,12 @@ export class TbGSysDungeon { this.name = _json_.name if (_json_.banner === undefined) { throw new Error() } this.banner = _json_.banner + if (_json_.type === undefined) { throw new Error() } + this.type = _json_.type if (_json_.tigs === undefined) { throw new Error() } this.tigs = _json_.tigs + if (_json_.consume === undefined) { throw new Error() } + this.consume = new TbGEntity.TResource(_json_.consume) } /** @@ -944,10 +954,18 @@ export class TbGSysDungeon { * 副本封面 */ readonly banner: string + /** + * 游戏模式 + */ + readonly type: string /** * 类标识 */ readonly tigs: string + /** + * 消耗资源 + */ + readonly consume: TbGEntity.TResource resolve(tables:Tables) { diff --git a/JisolGameCocos/assets/script/ui/Dungeon/DungeonShowItem.ts b/JisolGameCocos/assets/script/ui/Dungeon/DungeonShowItem.ts index 662e3f6c..bdd8c75e 100644 --- a/JisolGameCocos/assets/script/ui/Dungeon/DungeonShowItem.ts +++ b/JisolGameCocos/assets/script/ui/Dungeon/DungeonShowItem.ts @@ -2,6 +2,9 @@ import { _decorator, Component, Node } from 'cc'; import JNScrollViewItem from '../../../../extensions/ngame/assets/ngame/util/components/scrollview/JNScrollViewItem'; import { TB } from '../../config/data/schema'; import { Label } from 'cc'; +import GBattleModeManager, { BattleMode } from '../../battle/GBattleModeManager'; +import { app, TD } from '../../App'; +import { GUI } from '../UIConfig'; const { ccclass, property } = _decorator; @ccclass('DungeonShowItem') @@ -23,6 +26,14 @@ export class DungeonShowItem extends JNScrollViewItem { } + //点击副本 + onClickDungeon(){ + + GBattleModeManager.getIns().Open(BattleMode[`${this.data.type}`],true,TD[`${this.data.tigs}`].getDataList()[0].data); + app.layer.Close(GUI.DungeonView); + + } + } diff --git a/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts b/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts index 981334c9..0a1b7f8e 100644 --- a/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts +++ b/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts @@ -1,7 +1,7 @@ import { _decorator, Component, Node } from 'cc'; import JNLayerBase from '../../../../extensions/ngame/assets/ngame/ui/base/JNLayerBase'; import { Prefab } from 'cc'; -import PlayerPetData from '../../data/PlayerPetData'; +import PlayerPetData, { PlayerPetEvent } from '../../data/PlayerPetData'; import JNScrollView from '../../../../extensions/ngame/assets/ngame/util/components/scrollview/JNScrollView'; import { NodeEventType } from 'cc'; import { sp } from 'cc'; @@ -50,9 +50,23 @@ export class IntoBattleView extends JNLayerBase { console.log("你选择的是",this.tIndex); + app.event.on(PlayerPetEvent.UPDATE_MINUS,this.onPetMinus,this); //减少宠物 + this.onUpdateView(); } + + onJNClose(): void { + //取消监听 + app.event.off(PlayerPetEvent.UPDATE_INFO,this.onPetMinus,this); //减少宠物 + } + + onPetMinus(pet:PlayerPetOV){ + this.views.getItems().forEach(item => { + if(item.data.petId == pet.petId) + this.views.delData(item.data); + }); + } //刷新页面 onUpdateView(){ diff --git a/JisolGameServer/Main/src/main/java/cfg/TB/TbGRole.java b/JisolGameServer/Main/src/main/java/cfg/TB/TbGRole.java index 68f77f58..6b119dd0 100644 --- a/JisolGameServer/Main/src/main/java/cfg/TB/TbGRole.java +++ b/JisolGameServer/Main/src/main/java/cfg/TB/TbGRole.java @@ -22,6 +22,7 @@ public final class TbGRole extends AbstractBean { { com.google.gson.JsonArray _json0_ = _buf.get("roleSkillIds").getAsJsonArray(); int __n0 = _json0_.size(); roleSkillIds = new int[__n0]; int __index0=0; for(JsonElement __e0 : _json0_) { int __v0; __v0 = __e0.getAsInt(); roleSkillIds[__index0++] = __v0; } } roleAttackRange = _buf.get("roleAttackRange").getAsInt(); roleHight = _buf.get("roleHight").getAsInt(); + roleScale = _buf.get("roleScale").getAsInt(); } public static TbGRole deserialize(JsonObject _buf) { @@ -52,6 +53,10 @@ public final class TbGRole extends AbstractBean { * 角色高度 */ public final int roleHight; + /** + * 宠物默认缩放 + */ + public final int roleScale; public static final int __ID__ = 319398927; @@ -67,6 +72,7 @@ public final class TbGRole extends AbstractBean { + "(format_field_name __code_style field.name):" + roleSkillIds + "," + "(format_field_name __code_style field.name):" + roleAttackRange + "," + "(format_field_name __code_style field.name):" + roleHight + "," + + "(format_field_name __code_style field.name):" + roleScale + "," + "}"; } } diff --git a/JisolGameServer/Main/src/main/java/cfg/TB/TbGSysDungeon.java b/JisolGameServer/Main/src/main/java/cfg/TB/TbGSysDungeon.java index 306cee1e..8e061232 100644 --- a/JisolGameServer/Main/src/main/java/cfg/TB/TbGSysDungeon.java +++ b/JisolGameServer/Main/src/main/java/cfg/TB/TbGSysDungeon.java @@ -19,7 +19,9 @@ public final class TbGSysDungeon extends AbstractBean { id = _buf.get("id").getAsInt(); name = _buf.get("name").getAsString(); banner = _buf.get("banner").getAsString(); + type = _buf.get("type").getAsString(); tigs = _buf.get("tigs").getAsString(); + consume = cfg.TbGEntity.TResource.deserialize(_buf.get("consume").getAsJsonObject()); } public static TbGSysDungeon deserialize(JsonObject _buf) { @@ -38,10 +40,18 @@ public final class TbGSysDungeon extends AbstractBean { * 副本封面 */ public final String banner; + /** + * 游戏模式 + */ + public final String type; /** * 类标识 */ public final String tigs; + /** + * 消耗资源 + */ + public final cfg.TbGEntity.TResource consume; public static final int __ID__ = 303165446; @@ -54,7 +64,9 @@ public final class TbGSysDungeon extends AbstractBean { + "(format_field_name __code_style field.name):" + id + "," + "(format_field_name __code_style field.name):" + name + "," + "(format_field_name __code_style field.name):" + banner + "," + + "(format_field_name __code_style field.name):" + type + "," + "(format_field_name __code_style field.name):" + tigs + "," + + "(format_field_name __code_style field.name):" + consume + "," + "}"; } } diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerPetController.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerPetController.java index ef043f5e..ad259817 100644 --- a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerPetController.java +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerPetController.java @@ -1,13 +1,9 @@ package cn.jisol.game.controller.game; -import cfg.TB.TbGRoleUpLevel; -import cfg.TbGEntity.TResource; import cn.jisol.game.controller.argsresolver.CurrentPlayer; -import cn.jisol.game.controller.exception.ResourceNotException; import cn.jisol.game.data.TD; import cn.jisol.game.entity.table.Player; import cn.jisol.game.entity.table.PlayerPet; -import cn.jisol.game.entity.table.Resource; import cn.jisol.game.service.PlayerPetService; import cn.jisol.game.service.ResourceService; import cn.jisol.game.vo.news.NewsResource; diff --git a/JisolGameServer/Main/src/main/resources/json/tbgresource.json b/JisolGameServer/Main/src/main/resources/json/tbgresource.json index 1c53050b..efc4cb55 100644 --- a/JisolGameServer/Main/src/main/resources/json/tbgresource.json +++ b/JisolGameServer/Main/src/main/resources/json/tbgresource.json @@ -16,5 +16,17 @@ "name": "通用加速卷", "tig": "加速卷 用来加速一切需要时间的东西 减少冷却:60s", "args": "60" + }, + { + "id": 90004, + "name": "钥匙:金币副本", + "tig": "金币副本的钥匙", + "args": "" + }, + { + "id": 90005, + "name": "钥匙:锻造石副本", + "tig": "锻造石副本的钥匙", + "args": "" } ] \ No newline at end of file diff --git a/JisolGameServer/Main/src/main/resources/json/tbgrole.json b/JisolGameServer/Main/src/main/resources/json/tbgrole.json index 0bb8e179..0549458e 100644 --- a/JisolGameServer/Main/src/main/resources/json/tbgrole.json +++ b/JisolGameServer/Main/src/main/resources/json/tbgrole.json @@ -5,7 +5,8 @@ "spine": 130001, "roleSkillIds": [], "roleAttackRange": 100, - "roleHight": 140 + "roleHight": 140, + "roleScale": 1 }, { "id": 10002, @@ -13,7 +14,8 @@ "spine": 130002, "roleSkillIds": [], "roleAttackRange": 100, - "roleHight": 140 + "roleHight": 140, + "roleScale": 1 }, { "id": 10003, @@ -23,7 +25,8 @@ 40001 ], "roleAttackRange": 500, - "roleHight": 140 + "roleHight": 140, + "roleScale": 1 }, { "id": 10004, @@ -33,7 +36,8 @@ 40002 ], "roleAttackRange": 350, - "roleHight": 140 + "roleHight": 140, + "roleScale": 1 }, { "id": 10005, @@ -41,7 +45,8 @@ "spine": 130005, "roleSkillIds": [], "roleAttackRange": 350, - "roleHight": 140 + "roleHight": 140, + "roleScale": 1 }, { "id": 10006, @@ -49,7 +54,8 @@ "spine": 130006, "roleSkillIds": [], "roleAttackRange": 500, - "roleHight": 140 + "roleHight": 140, + "roleScale": 1 }, { "id": 10007, @@ -59,6 +65,16 @@ 40003 ], "roleAttackRange": 100, - "roleHight": 140 + "roleHight": 140, + "roleScale": 1 + }, + { + "id": 170001, + "roleName": "雷吉艾斯", + "spine": 130005, + "roleSkillIds": [], + "roleAttackRange": 700, + "roleHight": 140, + "roleScale": 2 } ] \ No newline at end of file diff --git a/JisolGameServer/Main/src/main/resources/json/tbgroleattack.json b/JisolGameServer/Main/src/main/resources/json/tbgroleattack.json index 4b6f651a..2bd05462 100644 --- a/JisolGameServer/Main/src/main/resources/json/tbgroleattack.json +++ b/JisolGameServer/Main/src/main/resources/json/tbgroleattack.json @@ -44,5 +44,10 @@ "id": 10007, "attackWay": "Normal", "attackArgs": [] + }, + { + "id": 170001, + "attackWay": "Normal", + "attackArgs": [] } ] \ No newline at end of file diff --git a/JisolGameServer/Main/src/main/resources/json/tbgsysdungeon.json b/JisolGameServer/Main/src/main/resources/json/tbgsysdungeon.json index 7608bea3..af49d2c1 100644 --- a/JisolGameServer/Main/src/main/resources/json/tbgsysdungeon.json +++ b/JisolGameServer/Main/src/main/resources/json/tbgsysdungeon.json @@ -1,14 +1,24 @@ [ { "id": 160001, - "name": "钻石副本", + "name": "金币副本", "banner": "", - "tigs": "TbGSysDungeon160001" + "type": "GDungeonMode", + "tigs": "TbGSysDungeon160001", + "consume": { + "id": 90004, + "value": 1 + } }, { "id": 160002, "name": "锻造石副本", "banner": "", - "tigs": "TbGSysDungeon160002" + "type": "GDungeonMode", + "tigs": "TbGSysDungeon160002", + "consume": { + "id": 90005, + "value": 1 + } } ] \ No newline at end of file diff --git a/JisolGameServer/Main/src/main/resources/json/tbgsysdungeon160001.json b/JisolGameServer/Main/src/main/resources/json/tbgsysdungeon160001.json index 8e38124e..21513a87 100644 --- a/JisolGameServer/Main/src/main/resources/json/tbgsysdungeon160001.json +++ b/JisolGameServer/Main/src/main/resources/json/tbgsysdungeon160001.json @@ -3,7 +3,7 @@ "id": 1, "data": { "level": 1, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -26,7 +26,7 @@ "id": 2, "data": { "level": 2, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -49,7 +49,7 @@ "id": 3, "data": { "level": 3, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -72,7 +72,7 @@ "id": 4, "data": { "level": 4, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -95,7 +95,7 @@ "id": 5, "data": { "level": 5, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -118,7 +118,7 @@ "id": 6, "data": { "level": 6, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -141,7 +141,7 @@ "id": 7, "data": { "level": 7, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -164,7 +164,7 @@ "id": 8, "data": { "level": 8, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -187,7 +187,7 @@ "id": 9, "data": { "level": 9, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -210,7 +210,7 @@ "id": 10, "data": { "level": 10, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -233,7 +233,7 @@ "id": 11, "data": { "level": 11, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -256,7 +256,7 @@ "id": 12, "data": { "level": 12, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -279,7 +279,7 @@ "id": 13, "data": { "level": 13, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -302,7 +302,7 @@ "id": 14, "data": { "level": 14, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -325,7 +325,7 @@ "id": 15, "data": { "level": 15, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -348,7 +348,7 @@ "id": 16, "data": { "level": 16, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -371,7 +371,7 @@ "id": 17, "data": { "level": 17, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -394,7 +394,7 @@ "id": 18, "data": { "level": 18, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -417,7 +417,7 @@ "id": 19, "data": { "level": 19, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -440,7 +440,7 @@ "id": 20, "data": { "level": 20, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -463,7 +463,7 @@ "id": 21, "data": { "level": 21, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -486,7 +486,7 @@ "id": 22, "data": { "level": 22, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -509,7 +509,7 @@ "id": 23, "data": { "level": 23, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -532,7 +532,7 @@ "id": 24, "data": { "level": 24, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -555,7 +555,7 @@ "id": 25, "data": { "level": 25, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -578,7 +578,7 @@ "id": 26, "data": { "level": 26, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -601,7 +601,7 @@ "id": 27, "data": { "level": 27, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -624,7 +624,7 @@ "id": 28, "data": { "level": 28, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -647,7 +647,7 @@ "id": 29, "data": { "level": 29, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -670,7 +670,7 @@ "id": 30, "data": { "level": 30, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -693,7 +693,7 @@ "id": 31, "data": { "level": 31, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -716,7 +716,7 @@ "id": 32, "data": { "level": 32, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -739,7 +739,7 @@ "id": 33, "data": { "level": 33, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -762,7 +762,7 @@ "id": 34, "data": { "level": 34, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -785,7 +785,7 @@ "id": 35, "data": { "level": 35, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -808,7 +808,7 @@ "id": 36, "data": { "level": 36, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -831,7 +831,7 @@ "id": 37, "data": { "level": 37, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -854,7 +854,7 @@ "id": 38, "data": { "level": 38, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -877,7 +877,7 @@ "id": 39, "data": { "level": 39, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -900,7 +900,7 @@ "id": 40, "data": { "level": 40, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -923,7 +923,7 @@ "id": 41, "data": { "level": 41, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -946,7 +946,7 @@ "id": 42, "data": { "level": 42, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -969,7 +969,7 @@ "id": 43, "data": { "level": 43, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -992,7 +992,7 @@ "id": 44, "data": { "level": 44, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1015,7 +1015,7 @@ "id": 45, "data": { "level": 45, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1038,7 +1038,7 @@ "id": 46, "data": { "level": 46, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1061,7 +1061,7 @@ "id": 47, "data": { "level": 47, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1084,7 +1084,7 @@ "id": 48, "data": { "level": 48, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1107,7 +1107,7 @@ "id": 49, "data": { "level": 49, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1130,7 +1130,7 @@ "id": 50, "data": { "level": 50, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1153,7 +1153,7 @@ "id": 51, "data": { "level": 51, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1176,7 +1176,7 @@ "id": 52, "data": { "level": 52, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1199,7 +1199,7 @@ "id": 53, "data": { "level": 53, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1222,7 +1222,7 @@ "id": 54, "data": { "level": 54, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1245,7 +1245,7 @@ "id": 55, "data": { "level": 55, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1268,7 +1268,7 @@ "id": 56, "data": { "level": 56, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1291,7 +1291,7 @@ "id": 57, "data": { "level": 57, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1314,7 +1314,7 @@ "id": 58, "data": { "level": 58, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1337,7 +1337,7 @@ "id": 59, "data": { "level": 59, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1360,7 +1360,7 @@ "id": 60, "data": { "level": 60, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1383,7 +1383,7 @@ "id": 61, "data": { "level": 61, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1406,7 +1406,7 @@ "id": 62, "data": { "level": 62, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1429,7 +1429,7 @@ "id": 63, "data": { "level": 63, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1452,7 +1452,7 @@ "id": 64, "data": { "level": 64, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1475,7 +1475,7 @@ "id": 65, "data": { "level": 65, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1498,7 +1498,7 @@ "id": 66, "data": { "level": 66, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1521,7 +1521,7 @@ "id": 67, "data": { "level": 67, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1544,7 +1544,7 @@ "id": 68, "data": { "level": 68, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1567,7 +1567,7 @@ "id": 69, "data": { "level": 69, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1590,7 +1590,7 @@ "id": 70, "data": { "level": 70, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1613,7 +1613,7 @@ "id": 71, "data": { "level": 71, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1636,7 +1636,7 @@ "id": 72, "data": { "level": 72, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1659,7 +1659,7 @@ "id": 73, "data": { "level": 73, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1682,7 +1682,7 @@ "id": 74, "data": { "level": 74, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1705,7 +1705,7 @@ "id": 75, "data": { "level": 75, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1728,7 +1728,7 @@ "id": 76, "data": { "level": 76, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1751,7 +1751,7 @@ "id": 77, "data": { "level": 77, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1774,7 +1774,7 @@ "id": 78, "data": { "level": 78, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1797,7 +1797,7 @@ "id": 79, "data": { "level": 79, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1820,7 +1820,7 @@ "id": 80, "data": { "level": 80, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1843,7 +1843,7 @@ "id": 81, "data": { "level": 81, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1866,7 +1866,7 @@ "id": 82, "data": { "level": 82, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1889,7 +1889,7 @@ "id": 83, "data": { "level": 83, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1912,7 +1912,7 @@ "id": 84, "data": { "level": 84, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1935,7 +1935,7 @@ "id": 85, "data": { "level": 85, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1958,7 +1958,7 @@ "id": 86, "data": { "level": 86, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1981,7 +1981,7 @@ "id": 87, "data": { "level": 87, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2004,7 +2004,7 @@ "id": 88, "data": { "level": 88, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2027,7 +2027,7 @@ "id": 89, "data": { "level": 89, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2050,7 +2050,7 @@ "id": 90, "data": { "level": 90, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2073,7 +2073,7 @@ "id": 91, "data": { "level": 91, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2096,7 +2096,7 @@ "id": 92, "data": { "level": 92, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2119,7 +2119,7 @@ "id": 93, "data": { "level": 93, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2142,7 +2142,7 @@ "id": 94, "data": { "level": 94, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2165,7 +2165,7 @@ "id": 95, "data": { "level": 95, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2188,7 +2188,7 @@ "id": 96, "data": { "level": 96, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2211,7 +2211,7 @@ "id": 97, "data": { "level": 97, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2234,7 +2234,7 @@ "id": 98, "data": { "level": 98, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2257,7 +2257,7 @@ "id": 99, "data": { "level": 99, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2280,7 +2280,7 @@ "id": 100, "data": { "level": 100, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, diff --git a/JisolGameServer/Main/src/main/resources/json/tbgsysdungeon160002.json b/JisolGameServer/Main/src/main/resources/json/tbgsysdungeon160002.json index d80b33a3..796eb989 100644 --- a/JisolGameServer/Main/src/main/resources/json/tbgsysdungeon160002.json +++ b/JisolGameServer/Main/src/main/resources/json/tbgsysdungeon160002.json @@ -3,7 +3,7 @@ "id": 1, "data": { "level": 1, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -26,7 +26,7 @@ "id": 2, "data": { "level": 2, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -49,7 +49,7 @@ "id": 3, "data": { "level": 3, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -72,7 +72,7 @@ "id": 4, "data": { "level": 4, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -95,7 +95,7 @@ "id": 5, "data": { "level": 5, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -118,7 +118,7 @@ "id": 6, "data": { "level": 6, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -141,7 +141,7 @@ "id": 7, "data": { "level": 7, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -164,7 +164,7 @@ "id": 8, "data": { "level": 8, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -187,7 +187,7 @@ "id": 9, "data": { "level": 9, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -210,7 +210,7 @@ "id": 10, "data": { "level": 10, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -233,7 +233,7 @@ "id": 11, "data": { "level": 11, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -256,7 +256,7 @@ "id": 12, "data": { "level": 12, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -279,7 +279,7 @@ "id": 13, "data": { "level": 13, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -302,7 +302,7 @@ "id": 14, "data": { "level": 14, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -325,7 +325,7 @@ "id": 15, "data": { "level": 15, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -348,7 +348,7 @@ "id": 16, "data": { "level": 16, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -371,7 +371,7 @@ "id": 17, "data": { "level": 17, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -394,7 +394,7 @@ "id": 18, "data": { "level": 18, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -417,7 +417,7 @@ "id": 19, "data": { "level": 19, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -440,7 +440,7 @@ "id": 20, "data": { "level": 20, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -463,7 +463,7 @@ "id": 21, "data": { "level": 21, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -486,7 +486,7 @@ "id": 22, "data": { "level": 22, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -509,7 +509,7 @@ "id": 23, "data": { "level": 23, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -532,7 +532,7 @@ "id": 24, "data": { "level": 24, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -555,7 +555,7 @@ "id": 25, "data": { "level": 25, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -578,7 +578,7 @@ "id": 26, "data": { "level": 26, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -601,7 +601,7 @@ "id": 27, "data": { "level": 27, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -624,7 +624,7 @@ "id": 28, "data": { "level": 28, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -647,7 +647,7 @@ "id": 29, "data": { "level": 29, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -670,7 +670,7 @@ "id": 30, "data": { "level": 30, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -693,7 +693,7 @@ "id": 31, "data": { "level": 31, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -716,7 +716,7 @@ "id": 32, "data": { "level": 32, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -739,7 +739,7 @@ "id": 33, "data": { "level": 33, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -762,7 +762,7 @@ "id": 34, "data": { "level": 34, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -785,7 +785,7 @@ "id": 35, "data": { "level": 35, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -808,7 +808,7 @@ "id": 36, "data": { "level": 36, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -831,7 +831,7 @@ "id": 37, "data": { "level": 37, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -854,7 +854,7 @@ "id": 38, "data": { "level": 38, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -877,7 +877,7 @@ "id": 39, "data": { "level": 39, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -900,7 +900,7 @@ "id": 40, "data": { "level": 40, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -923,7 +923,7 @@ "id": 41, "data": { "level": 41, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -946,7 +946,7 @@ "id": 42, "data": { "level": 42, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -969,7 +969,7 @@ "id": 43, "data": { "level": 43, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -992,7 +992,7 @@ "id": 44, "data": { "level": 44, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1015,7 +1015,7 @@ "id": 45, "data": { "level": 45, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1038,7 +1038,7 @@ "id": 46, "data": { "level": 46, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1061,7 +1061,7 @@ "id": 47, "data": { "level": 47, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1084,7 +1084,7 @@ "id": 48, "data": { "level": 48, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1107,7 +1107,7 @@ "id": 49, "data": { "level": 49, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1130,7 +1130,7 @@ "id": 50, "data": { "level": 50, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1153,7 +1153,7 @@ "id": 51, "data": { "level": 51, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1176,7 +1176,7 @@ "id": 52, "data": { "level": 52, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1199,7 +1199,7 @@ "id": 53, "data": { "level": 53, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1222,7 +1222,7 @@ "id": 54, "data": { "level": 54, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1245,7 +1245,7 @@ "id": 55, "data": { "level": 55, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1268,7 +1268,7 @@ "id": 56, "data": { "level": 56, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1291,7 +1291,7 @@ "id": 57, "data": { "level": 57, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1314,7 +1314,7 @@ "id": 58, "data": { "level": 58, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1337,7 +1337,7 @@ "id": 59, "data": { "level": 59, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1360,7 +1360,7 @@ "id": 60, "data": { "level": 60, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1383,7 +1383,7 @@ "id": 61, "data": { "level": 61, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1406,7 +1406,7 @@ "id": 62, "data": { "level": 62, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1429,7 +1429,7 @@ "id": 63, "data": { "level": 63, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1452,7 +1452,7 @@ "id": 64, "data": { "level": 64, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1475,7 +1475,7 @@ "id": 65, "data": { "level": 65, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1498,7 +1498,7 @@ "id": 66, "data": { "level": 66, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1521,7 +1521,7 @@ "id": 67, "data": { "level": 67, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1544,7 +1544,7 @@ "id": 68, "data": { "level": 68, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1567,7 +1567,7 @@ "id": 69, "data": { "level": 69, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1590,7 +1590,7 @@ "id": 70, "data": { "level": 70, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1613,7 +1613,7 @@ "id": 71, "data": { "level": 71, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1636,7 +1636,7 @@ "id": 72, "data": { "level": 72, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1659,7 +1659,7 @@ "id": 73, "data": { "level": 73, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1682,7 +1682,7 @@ "id": 74, "data": { "level": 74, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1705,7 +1705,7 @@ "id": 75, "data": { "level": 75, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1728,7 +1728,7 @@ "id": 76, "data": { "level": 76, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1751,7 +1751,7 @@ "id": 77, "data": { "level": 77, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1774,7 +1774,7 @@ "id": 78, "data": { "level": 78, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1797,7 +1797,7 @@ "id": 79, "data": { "level": 79, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1820,7 +1820,7 @@ "id": 80, "data": { "level": 80, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1843,7 +1843,7 @@ "id": 81, "data": { "level": 81, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1866,7 +1866,7 @@ "id": 82, "data": { "level": 82, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1889,7 +1889,7 @@ "id": 83, "data": { "level": 83, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1912,7 +1912,7 @@ "id": 84, "data": { "level": 84, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1935,7 +1935,7 @@ "id": 85, "data": { "level": 85, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1958,7 +1958,7 @@ "id": 86, "data": { "level": 86, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -1981,7 +1981,7 @@ "id": 87, "data": { "level": 87, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2004,7 +2004,7 @@ "id": 88, "data": { "level": 88, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2027,7 +2027,7 @@ "id": 89, "data": { "level": 89, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2050,7 +2050,7 @@ "id": 90, "data": { "level": 90, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2073,7 +2073,7 @@ "id": 91, "data": { "level": 91, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2096,7 +2096,7 @@ "id": 92, "data": { "level": 92, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2119,7 +2119,7 @@ "id": 93, "data": { "level": 93, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2142,7 +2142,7 @@ "id": 94, "data": { "level": 94, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2165,7 +2165,7 @@ "id": 95, "data": { "level": 95, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2188,7 +2188,7 @@ "id": 96, "data": { "level": 96, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2211,7 +2211,7 @@ "id": 97, "data": { "level": 97, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2234,7 +2234,7 @@ "id": 98, "data": { "level": 98, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2257,7 +2257,7 @@ "id": 99, "data": { "level": 99, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001, @@ -2280,7 +2280,7 @@ "id": 100, "data": { "level": 100, - "boss": 10005, + "boss": 170001, "attributes": [ { "id": 110001,