From 1b4db3c98052604265a74762a77f305dcacee2c2 Mon Sep 17 00:00:00 2001 From: "PC-20230316NUNE\\Administrator" <2858626794@qq.com> Date: Wed, 17 Jan 2024 18:36:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataTables/Datas/__tables__.xlsx | Bin 10843 -> 10910 bytes DataTables/Datas/副本系统/副本表.xlsx | Bin 9997 -> 9889 bytes DataTables/Datas/副本系统/金币副本表.xlsx | Bin 12992 -> 12667 bytes DataTables/Datas/副本系统/锻造石副本表.xlsx | Bin 13028 -> 12809 bytes DataTables/Datas/常用/资源表.xlsx | Bin 10161 -> 10203 bytes DataTables/Datas/战斗/宠物/宠物攻击.xlsx | Bin 9838 -> 10920 bytes DataTables/Datas/战斗/宠物/宠物表.xlsx | Bin 10303 -> 11606 bytes .../assets/resources/WorldCanvas.prefab | 4 + .../resources/config/json/tbgresource.json | 12 + .../assets/resources/config/json/tbgrole.json | 30 +- .../resources/config/json/tbgroleattack.json | 5 + .../resources/config/json/tbgsysdungeon.json | 16 +- .../config/json/tbgsysdungeon160001.json | 200 +++---- .../config/json/tbgsysdungeon160001.json.meta | 11 + .../config/json/tbgsysdungeon160002.json | 200 +++---- .../config/json/tbgsysdungeon160002.json.meta | 11 + .../prefab/battle/mode/GDungeonMode.prefab | 565 ++++++++++++++++++ .../battle/mode/GDungeonMode.prefab.meta | 13 + .../prefab/battle/mode/GOnHookMode.prefab | 12 +- .../resources/prefab/ui/主页/MainView.prefab | 2 +- .../prefab/ui/副本页面/副本展示节点.prefab | 32 +- .../script/battle/GBattleModeManager.ts | 9 +- .../base/role/CampGuardian/GRoleCGCrystal.ts | 3 - .../script/battle/base/role/GRoleBase.ts | 1 + .../battle/base/values/GAttributeData.ts | 11 + .../battle/base/values/attribute/default.meta | 9 + .../attribute/default/GDefaultAttribute.ts | 24 + .../default/GDefaultAttribute.ts.meta | 9 + .../script/battle/modes/GDungeonMode.ts | 112 ++-- .../script/battle/modes/GDungeonMode.ts.meta | 9 + .../assets/script/battle/modes/GOnHookMode.ts | 162 +---- .../battle/modes/OnHook/GFSMOnHookMode.ts | 5 +- .../battle/modes/default/GNormalModeBase.ts | 179 +++++- .../modes/default/GNormalModeBase.ts.meta | 9 + .../assets/script/config/data/schema.ts | 18 + .../script/ui/Dungeon/DungeonShowItem.ts | 11 + .../script/ui/Tactical/IntoBattleView.ts | 16 +- .../Main/src/main/java/cfg/TB/TbGRole.java | 6 + .../src/main/java/cfg/TB/TbGSysDungeon.java | 12 + .../controller/game/GPlayerPetController.java | 4 - .../src/main/resources/json/tbgresource.json | 12 + .../Main/src/main/resources/json/tbgrole.json | 30 +- .../main/resources/json/tbgroleattack.json | 5 + .../main/resources/json/tbgsysdungeon.json | 16 +- .../resources/json/tbgsysdungeon160001.json | 200 +++---- .../resources/json/tbgsysdungeon160002.json | 200 +++---- 46 files changed, 1518 insertions(+), 667 deletions(-) create mode 100644 JisolGameCocos/assets/resources/config/json/tbgsysdungeon160001.json.meta create mode 100644 JisolGameCocos/assets/resources/config/json/tbgsysdungeon160002.json.meta create mode 100644 JisolGameCocos/assets/resources/prefab/battle/mode/GDungeonMode.prefab create mode 100644 JisolGameCocos/assets/resources/prefab/battle/mode/GDungeonMode.prefab.meta create mode 100644 JisolGameCocos/assets/script/battle/base/values/attribute/default.meta create mode 100644 JisolGameCocos/assets/script/battle/base/values/attribute/default/GDefaultAttribute.ts create mode 100644 JisolGameCocos/assets/script/battle/base/values/attribute/default/GDefaultAttribute.ts.meta create mode 100644 JisolGameCocos/assets/script/battle/modes/GDungeonMode.ts.meta create mode 100644 JisolGameCocos/assets/script/battle/modes/default/GNormalModeBase.ts.meta diff --git a/DataTables/Datas/__tables__.xlsx b/DataTables/Datas/__tables__.xlsx index 38156871e949bbeef7bbc6bc3794cb6c803aff31..28e2bb004d7ef09cec1fea2f6bcee2c38f9fcb62 100644 GIT binary patch delta 3385 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 PA(I#?JqCd$00000YC%}d delta 3273 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 H00000ut_)1 diff --git a/DataTables/Datas/副本系统/副本表.xlsx b/DataTables/Datas/副本系统/副本表.xlsx index 2b934e59646afa5ae4e7e4b90618181d5caaabeb..919c1d29e89970c342539fe3c6ac0eb177036074 100644 GIT binary patch delta 5059 zcmZvAbyO7Gw>C4Rba&5ybPR*i4I?QC3Ij;jNJ{rm!U#wWA)NxRC^3W#NFzvzf^?@K z-5_=Gy}!He_kHU-e?04~XUB8STKkW^_Zz)J-Re{T{_9bvH>k?y(_5<%y z20V5>OB~lSd|jkx^j?h;HH2wvpsJynif#Zsw2F8W7fpe|zA!dkdx$4sto#Ws=Rh>fP2j!<7YKL%6d(_q7~eI#Nc_$>Y@ z4LY=-I?qZgMzb2=7o_XJ!#WBEtikNXJNR-$Tu>|CEN@97os#*k8?jy}8iuAP&h}+!YOZUh5RiYew!&EnH zfkyTgM@j_qug2CdS4$E-rCHqN{>yX4?pi|JIskduru~8o9u5v2B@PZF4tkE48JTAM+`U+eHpCKf zi+gyf#EDRNpY#KYM>L{Uyz^~af=4fc_$~e?#IK1xNdg;7{p zn5ydD8$N67esI6LK)sV3@zS#|5qTx5ZSzx3g#2X>@$VErQ*>3f;;o6L$%%PB{~CcB z-;0bKY0*953cYX8L}w&Atu73i@S)$9T(JWEG=uI9#ZZA5y-)^43TOP1%^hpAp zk`FURamnp>Pu6no0Grp!grP{^zF6CAQWAAnS!9nj`wVzS;lt6_ya&*zW8tiR-HZx15xH|jC zK?J_hw`h&52aR(*NyWLo&|u3|r^|2VB5rKt!VmkFn%NYx-yUVx4o@%b&ynZr4P~QM zlXVX-e2xd}-1SU3T?dY<#P{KU|TM5vw^Jst^4SSTHl!CBtO{ z75@5K`IeK9W!{MwnlNPhd=VkoW)f=>v8^edI@2e4t68vsw@vK>~j;tK!xh z@Mna$b6~+`7&}=uA!S)}XbXii#;jI8u1Mryy9wU)>b+1whj;YpxhQ#>O$O_Fa0EUAz zId%iloh&z!<v6aK@W&3Yw{wqPf!dfGlL_a)%| z6RH;4mum58+==A%wDEXD$am`boP$#oQp*HmTf*AO#%veq@SgjBjLmaLiXK1$qgEVk zI$xBp%9jSLe{j*CEX`w#2{Jp|BAsv~p83`tMGNckKf`U1p*l-G%oyQYNqLsIDcU$6 z27;$`s$;Pn%_VkpRm-Vyi1dytUgE2|KP1=dNPTTwJYt-`Ck7plM}b}hM~}&<37{FbgN)>i`!v!DW*feaI7-nNk71= zU%*BT#wB)9Rnkt?ji-JdOT0~viz&^V05a*B+>#7ci63p19l{sWI)yi2mn0L8L>?e@;?L~2Gk2IP}7OmR2 z%;=AqpBhkp(dy3B#RrR6=1eAbIXbSCS?b&b`yHMTjyUgjSfikbd%^u!_plrxqG!u0 z>NOwCA6Ua2dj(ak*n&-l8ESKYzf58{Q)oD)U+vWHepn%@o}BOscrp|hl9ASP45j{@ z_3Fm+^=DK-nte9%({NVI^Io15d|5QQM+)uz312%qQfqGHqiL(0XL7Z8DOC<<_@6@$ zh~W38XEV=j+GvRCzPG8LMoAx-<@zjZB|S0lvawIFcBnOlyG*Keq6|#t2Ai&_HH60l z8p}_u&sPF1Aiu|apqvqcGiG8yirfOnj@N1l?m4U-9_55c3KF8XYvs>1wj$dV3?y>` zj;M}9hFw9zydbQGWa<2wV=w3F@OL({+Q!t2)i zw_jwf$J!z2uRdyw*AxFSdm}V3JtLmMCOR@IUYS93rWQ}zw2^5%Ri0T2H?BAdoP&D% zoE!>rF8tg=Iy}XdOtp{k9uH;fo)Ab2RF{-geeP?_b!cqopl;#*mg&Ozo&*RfY~6#q zx^}kyJF9E(tEKk8w3ln24+{Kd`v0IL@&w?a?$P{z>c<^4ZcID>^)-g#g^k76M`tFt zrHe@%T0#cTxoFs(&#nu|w2_w7@NWim{w491uI>SP_oE2=aE7G2+&4H1d$klvt!tcu zDt4v`Lx)cnt62@Z+fdZwgH{0_xME_eKhufQO-6pdFNkmd6Xh}N66ez{VD|uD(pFev zMx)34JN;pIOL3v1(GWy9>)qFC=XB12CV1@U2N8gxN4*N$GOm8#b%DrCIU2Pk*xRqZ zEBNZ*ka?xV=Nd!$FErFEG!%xNEnEl*VaviY`FRhcNYz^@A$ZcNU-gALHDnlaCN!eC z^WTsv>#;D!GSt`XP*}Z|?Et+7cj+ftKoAZ)gJ3F?EKT&pc>E1_x-Go=XS8EKm#}4t zC2de*REWGa%pTur$5sIoZaz~MeWj9~hu$EukBsZ2;$}Z~9ROf}G#0Sr)jkI?f z?@e1%HwoAI&I5_>o9-*@>QuxU--^C^FUHtMt}dPvdsb{tT*i#_j~jTWpSBrGRJUBo z_~o`Ya<`Sn#Giw9M`8TEEJLyQpyzYQn@n%Q-O^2RoJhl`v58pkhN!47=d`7%BAJh^ zeOFTuq!fQLbZm`y)v$mUhjO!?SZi$KtC;!D3Y5UxuW?DlvCChebREsur{*0*ahfIq z0u9|2`jk$3uh7y+0a2zmPSske5%F4S5$F^CFGl`)|I`P@@-HX#{ZqDR7m}w{5s`%b z#b^H!vhXfV{?VAaLGmeJqZo=g^6L9`m_Ph>y8}$If%)>&z`lpX!$hAalMBd7Z>UM8 zo>yWIwQ9sORZ$ixO|Q0%`h%&y&K|{7%jb0QoLQNaoA;d}+1<*Yf`zdtudbZV7kzJn zVoP{p20GK(^#(e}+37PLtt>nG_}hLcFvUGsuQ{c zZi~t3E(H7zG|c~pv<6jHwVb9-(VaP6=fVSfWjh+5dJ}~voXoEz_>FfcixN%U2G*2G=o=c#_K!yW*y0yCmLx)0^~01RUMKS$rUV1=s7`oYK!k>#(*NC zFp^2_Qr)c26 zAK($aIG^jDKhJV=`VgI{7~5AMA#Qh`dyK#wAlb<|Ze@6tG~@d_stR;za&9-7h?qi> zi2&_l(DRV@h%Bz+na64Qy(8Zj^R&9EHgpU%ev3n$%5@R@m+TVITV#vu#s1WWABByy z)1o$_Xiup7veU*7d9rrCeX)8obJy`w~s8n@DGFl{1B1CKSM_Czq_=eGNQPVbBZR6&kYgifkV<+Y_ z^n99Fu#&qQ2G)xxMH-O9DzZN$be2qf8h>kL<37Wy21ZiZ9W_3QTQhJge-c544^L`RzvOSrUV+fRS14niV4(kCq`)g6yLXvKb< zIh6v?$lrAR(ZjGNv5a?tuQ1^tf`cZ;gjy3#YKq2iTh4CB_r`oI?6pmlwf|TYy7;gD zR#`2*^IJ-GCQ24;*Ghr=u-EQOHZXJ$+jrU0`<4<7xHgjGb-+fV}hw{Qa`!PYrG zA4&mn5*;)^As!d4lXyTlZIuIL^h@ZP__H6)a-|j7?)tTD7CG}zW^+*bv-g6sCn<%p zX({ljDdDH_>)&=O?FF(%uISVVLUcTjOe954J2busW&eQjEX@JOCbxt3;k{vu+No`N zRg!k=;3pgiOM?31+Zw91(8HR6omaN%W&gIh zPS&3G=l~v4WQ*Z|+o%%l9O!^z+@GW-H~lb4{yEMj@x8Qt08NmG24*iRa|>1df=6uz z|3z}rWEh`|72pLGP+geXl1BD|q(`&dDn~NKweMF>&~T=##L_xi&MVp+!NtX`JaC^p z#)KC*f|A?zt(@mf&>*-s0NzK%H}Ym5AHLIf_SO+bZlI2-2tUa^?hVP4m`lMWj}8Do z{r3Ip{m)U{FYuzv9NWAA*M)_BPu?)88X+7IhMuwv=b&-%6NA#FOkp8CRPA?@YN-kZ zVq;9{THt8*A;ejeJ5@jjs~BWwE_Ot0a}5VxptiuN&wvEM6-ev0Y+$ZkOaUVodiPvX9>m! zHUiv3hk%s;*63ES7_fi?y$_ZI_Hv*fbFvEQYXg9^{}#^wzntzW3I~A0d58MUXm=i7 z*8g{``d^1o3Um#RG*JH@dYeZQ=ywkd;#CBgqiuQR01@Z{UM`mZdt>xB@PBewqGx#p K38J|FGXDiKi+H;L delta 5167 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 H`-}M>lzM|% diff --git a/DataTables/Datas/副本系统/金币副本表.xlsx b/DataTables/Datas/副本系统/金币副本表.xlsx index eb812709e50d22e5526dedbb503af0cd56c04c99..084ada6e6fc1e2926278a0a070aa68b6bc119383 100644 GIT binary patch delta 7822 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 R_NTvMc)XYpv8gal@_*sE@;v|m delta 8140 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 Ydz0p$e;xnb_7hB*_cmq*_vP6C0EI-39RL6T diff --git a/DataTables/Datas/副本系统/锻造石副本表.xlsx b/DataTables/Datas/副本系统/锻造石副本表.xlsx index 109e277583291698fc97defdf4ebdc26375cf247..aa898d3edceb91d273dc38cce0106a4140a86552 100644 GIT binary patch delta 7896 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 delta 8151 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 diff --git a/DataTables/Datas/常用/资源表.xlsx b/DataTables/Datas/常用/资源表.xlsx index 746e960a6ff6d20d4a9f040425183c0bb63bc798..28dbed8d45e85545dcaafe809ea2af253b6cfc00 100644 GIT binary patch delta 5051 zcmZ8lbyU<{*PWre1Vn0xp(LbBq`MnLK|o4HhLVOKF!T&LfRrF1h)Tx{T_U0=Lx?mZ zAqX;b*Q?L-t@VE2cmKHetaJ9+d#$_nKj+k$%$U?>f{DMF1Y<2xxnNGUJ-aBD&7*^*fg<+g ziJP>XJ(KUS5+$P11lW?aT!;5-iZ5aa8EpremV=AAwb^PtG7AbdOI%9C#ig{!Ke##) znv7;AN@^Rd>c`bF8JNxj&0!j6-VQANFCOF(i?v`@DZ8JlpV~$(W!z2?cC^JOdLS~L zQ$-+#4uoahX>fu~k#f-_pp^z$4{*Ll!OK6*mhZ!+*E#E7dGv;dK5Yp1X|ijweqq;l zW)XI~qy0@0t6OVc7ARBGT-+(Ltryzh6GNN*ZOzwfZrmieFiOdG0r~)DQdDybvNcS9 z$q{1tbbecvWIk5rXWMeQRHv?h;G=8PlzJ-Aj!YUB4oP+Vo3_-iHeO%irdiJoJOee< zHA1p8xHk^(uBKrKp-o3SfNm$))PRr(bq-~1fD&ebX;|)P^xq@~fhewlKrA3slmIJ` zoHOIQC{Gu+g?_xyvvO7^0VOi;W~_^Hk#+a&^h1(W*QI~ARE^4AVzwaB@7x1~HuWNZ!bGOV}RCItV znMv$!U=vS_0-cjR^&Hc~{<n?-ZsAWZyfG-*kN{Uk7`*DLo)JCnGaCX zu%4_uG9OJ6%YBZWeO@W!K6P|9p|n>4%$a?X_v*KSp^bnhFe&@h ztzk!2YlZJgR&1SWPr8Ziv4cdOjs#+EMD=&~vtOws2uAC4ScgT%3YLR(U`Y?_Q>^8| zX2F_8|>TM`?JdhNpyV*xUKd6g14; zR&3`_Lj zZdVa-O#3+6AAJ&xEaB%No-?MMu+oBKo&|d8{9<>~k0?fx@Xg7aYIdue&f_dtwOB0{ zd46WylE)J{p2r{t%&AKwg@j*1N+-Ina6hsZ%PPq{wI(eapK6U;`g``5Rm#^gSybV! zQ=5dx^$3x;GjxZn1Ik^D>CdTCcT=Gy2?@2UEcYF~6ML9QzO&3adLw$+;kT*q5<%TK zdbj{pp+r!R<2&{``?NaWNVV}4HqFi2KM%zsT;>U&?n7{`ch%uC^YQDOO)9ic9~4M4 z+25m=WzuQpIW2YG)#}S%J94n9J0eHsl+5Oy*O4l8Y9hd{WCw7O`M4qC&=dAT znkoFR68L8C2o3q0UK9s|Wn6`w`8`Is1=UyaV?H%UdCQE=(ZYw`Q9XPlHZ1oadc%7} zN&Kkr;s9m<2ZrlV6^aLaz!AfDFlw2k%?8repFlld|4~dSSQC79`442+=zjq%rV6Me&{Y~;W8lD z{tnNgWqr?&(eU^-fl`v%GR5bC&=aWDd)P9M*uvn-7-{#be-tnYP`meXQ> zY3DBt?^|BZd%(4w^+R-5lgv&k$Hr-~>j^TS$?nZ+OfOL>F+j}q5V~s z-8Q`FxW`EColc2Ir+x-Zb-!zsHk#0Gs8`f(z4r@FU5szMjG=g(TF42~((T<9@~kD@ zF5@b?9+(WJKZzNTL=0viONjdrWwr-qd*&yj%sStueYRZkSo9B zC_&aBhl-h$d=A&<8U%)SEaJ=MqM+ntR@C-=LJZ0Zjo{if=R0ZXVuQCQw-VyOcXzS<%lIdea6mEihPGIK zZE3?&7I!VRvgaz|u5pyXI}N%)^0b29!$*P5K13eB-?k_Tt@d{s8I($jQaOB91zI#a zk-^C&UuG)4^i@A(&0xBXO4nA9GDI^O+>6%#W}0l>8L;fytDVcdNJMUl=o>6iU9x+E z2D;mq$fU7dR&Ko+$5q3M5q!FpuNCU*--~z5c)pYMRB|ddvz;4iy`VK~~Tz?b%v;f6h;JTvQBz zJo3Tz#|j#rc=-*l;kjGReo%*wqf7HaEq`o@@4@L^P~aqNZ_V^jU|f+{|Wkb>;5qikxa^ zb@M?v!DC&mc>j?IruS&p8hMIYK9|Vp^=cIVjkYtq1=F{6&7S;OlpnG8}nsm;V>>5A^#uapX6od7t6nExw`5 za~O-8(#II5&CZPjr(XtS&;4A8<1%}iHbnVf%&n{*ukA&ZnFh z-m$2@5Ka0E9(`Lt3cga8vIgnhwQjU@G!B=$FZ8-JULBu1?95S1k((Nwm!6$FO!C2H zhCtStTJlErJNNR4%;BDLD^2Nwz)3SKKAN#V8+tWO1*2wEZ4$`CKTbd~xcHyCl z$RF&f$h0|PM8Z8~YHH=CZ2qRkxKXOGLYn{=QdDL!`r{iweV)#o@kCvhewm6}tB!(g z5E%O)^GHs$GtaQL_yD^7$X<%jYKBP$ z{2WEk%*DVOVrvN}_EWC2;hunQW5qg@6T zFHq6UrGRlw3#st-_+lH<;lO!fg!@>*IxLms+$t!Eb@5tq8OoUKwVC|~l9GzA;phq;x@=hw_>E+yxmvI zD-;Sm=oQ*^MOC#sK}7ddlDsw3Z@vsS4m$eL>i{rNoVKW8oFOljBBJ@}4l z-HFIe)2PaEF3G>rnHg0nXCxVOIUXtK->>_`-p@q(n5tWNyZD^BF>?X3K*{`tBH7%tXEGweujNL(bS z+Z%X@dvvZuNghj?ICZ^ZXHSHcQH)j0>uP;tAk~?HnUdlH)d?|log4v6pP54^0YPV!6cPZ4;0AXVq&)4 zPNt-RTh_ey+{WdA_>Y&(7{n_bxIHHibyu2Q|3XPR2AG>Kd?(97Vr!k! zDcR-}Jk2{88o+Yc;t5O@?|?8J>gD{)ElzXCF-(q8|KA4dC1=@x1nwszX8#J{Ak%_k zz6uWDgjff#wKSoa+dpbKPrW7b*O_|bw7lT|0!4h;SXx~8$y*PVPl*H~vUu?`gq^_Y zM0bJWW%99`4s<}}J?y#KeqV(H8rGuhHbOrraY^Ec{Z^lH{+)lDf$yBcVi=#$H9Pa@ zS6gVD`4fZNn|bAS$$9gWQ&lpJ_^lMc>Z~r~>SvnkP*aGj2L~`tb2*?rF0gZCiN2!!I}bC0Kp-+uyz!#y=iV+O zQ34PshzJDwn+@{3<>%q#>*`|R@B7Hh-A^p&sb@##7q2l@#@Hj>_CAmHDB`9u^;n)6 zdoI^61f1Pa4QC!F22c>yU^L9ajOGl3(oc_GQOx@(i7+8!pY*67dc1yfjIYv-&dROzrVdwYA_kvC8cy(7`!4cDRDJc& z&3Yq{kTTX$On^r+iNPtOK>`tec@(EoIMmJuHL{EX%sYyQ8`{=plf5hQ4`5&K~*j1G+Kz zgZ%lR_$}#+QdHTD-<)Gc$&Yx#`Ov<(iusL3>xGrlWS1gu?H-w{i%7Y=*^5tdc7DvH zq$u=!sz%Km4nFY=m#jUXy@8eucK;1g+==O4I8)+)?YYfCAUkT`VPSgxzhA@}f8RQ9 zw*<}JDJ(qb%LOEkkC8{~JldAq^Ws*^jhawkg!%;ytdM^tmX7)-$Ntiu|MGTK$YemY z3ETYTmNy`HYNE6GQU%-7{vAGmP0Y{3kdvo z7y*H({}%t8f9pzg|JvF=*wfVyHNwmF4>=7gm0uPtgZjX)3eHB63Mhf2QJMnWZ2xyb S^uKwkQIP_|B%Qo}bN>OGfN4(v delta 4968 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 K^cDBNz5fDzOg~Qm diff --git a/DataTables/Datas/战斗/宠物/宠物攻击.xlsx b/DataTables/Datas/战斗/宠物/宠物攻击.xlsx index 899cadc059cf5f38528fbc823999ad6e9bbf7f1a..8f7446c5827a312c52e823ddd2a0c65efc3215b1 100644 GIT binary patch delta 7984 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 delta 6895 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 diff --git a/DataTables/Datas/战斗/宠物/宠物表.xlsx b/DataTables/Datas/战斗/宠物/宠物表.xlsx index 386a8626e6616f34130dd2b0d5c6ba8806138b84..31fcb3b6cefbe790d99309c11bac57936cdcd049 100644 GIT binary patch delta 8223 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 G&Hf(?f<0pZ delta 6926 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

VjJJ5#S5FUFdM%1i}LDR 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 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,