From 21b559abcf90d4ad384510a7676597e887d99840 Mon Sep 17 00:00:00 2001 From: walkpan Date: Sun, 11 Aug 2024 23:56:18 +0800 Subject: [PATCH] dd --- .../game/heros/cards/hero_card.prefab | 151 +- assets/resources/game/monster.meta | 9 - assets/resources/gui/gui/blue.png | Bin 0 -> 8062 bytes assets/resources/gui/gui/blue.png.meta | 134 + assets/resources/gui/gui/focus.png | Bin 0 -> 1629 bytes assets/resources/gui/gui/focus.png.meta | 134 + .../gui/prefab/role_controller.prefab | 2281 ++++++++--------- .../script/game/common/SingletonModuleComp.ts | 23 +- assets/script/game/common/config/CardSet.ts | 9 +- assets/script/game/map/CardController.ts | 1 + assets/script/game/map/view/MapViewComp.ts | 11 +- .../script/game/monster/HeroCardViewComp.ts | 31 +- assets/script/game/monster/MonsterViewComp.ts | 61 +- 13 files changed, 1561 insertions(+), 1284 deletions(-) delete mode 100644 assets/resources/game/monster.meta create mode 100644 assets/resources/gui/gui/blue.png create mode 100644 assets/resources/gui/gui/blue.png.meta create mode 100644 assets/resources/gui/gui/focus.png create mode 100644 assets/resources/gui/gui/focus.png.meta diff --git a/assets/resources/game/heros/cards/hero_card.prefab b/assets/resources/game/heros/cards/hero_card.prefab index 0b460896..e78c353a 100644 --- a/assets/resources/game/heros/cards/hero_card.prefab +++ b/assets/resources/game/heros/cards/hero_card.prefab @@ -23,19 +23,22 @@ }, { "__id__": 8 + }, + { + "__id__": 14 } ], "_active": true, "_components": [ { - "__id__": 14 + "__id__": 20 }, { - "__id__": 16 + "__id__": 22 } ], "_prefab": { - "__id__": 18 + "__id__": 24 }, "_lpos": { "__type__": "cc.Vec3", @@ -75,7 +78,7 @@ "__id__": 1 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 3 @@ -338,6 +341,142 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "active", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": false, + "_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": 1073741824, + "_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": 110, + "height": 110 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "13sh5Lj+5FIbltkc68Xf4S" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 18 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "fdf9c650-fb92-49bb-82ce-3007df7745b6@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6azJ507G9Lq60zCRcRIvnI" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "8eCsq/oFNMYb1bIWCaEPbY", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -348,7 +487,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 21 }, "_contentSize": { "__type__": "cc.Size", @@ -376,7 +515,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 23 }, "_id": "" }, diff --git a/assets/resources/game/monster.meta b/assets/resources/game/monster.meta deleted file mode 100644 index d00fb499..00000000 --- a/assets/resources/game/monster.meta +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ver": "1.2.0", - "importer": "directory", - "imported": true, - "uuid": "d5604362-ce57-4bc2-9a05-cb1ba2e170a2", - "files": [], - "subMetas": {}, - "userData": {} -} diff --git a/assets/resources/gui/gui/blue.png b/assets/resources/gui/gui/blue.png new file mode 100644 index 0000000000000000000000000000000000000000..422bc383d4985b611aa85375401bb50a5370ea85 GIT binary patch literal 8062 zcmV-^AA#VBP) ze~e~VS;xP3X5QKEj-8?1-Ifxe1?>-zAzG0b+9Cww7~87B;tztDNYFGf7!&=&Km5~w z{KudeGzJoiPy||qLUfF&$Px_!F>#QZ7DBf|*S6b*-7>q~d1vODduQ&u_dWM{p7T8C z$9-qp`y_9B?>WzT&bjA&?sK1W?zuY!!sRf4w*t5Wz>fjA3BXYRKM-MakQax1AHW#^ zj{^8AfD-^725>&)>Wihd4O4;5_0_incqf3LAAlPqv3v%=N0-(%KA|If_QU%^%?*l0Pwczyg2+ajIMtd7G8E2iqXn2T7x8! za(ousr#^@A(%QxssQN01=eUM!uCM+gfG<`6&mVmw4&VL|Mlb)B z0pLOMN->Xxm%kl{Z~qMDk5_93xE{d2ZmzGsjjNZ0cpu=utByyn{7qc(;~zk=c=a%P zgY+g9Z&%#<7Z|Ym zgM7OP@#gw!wa)t?)E@ZV7~Sw2!w3yBbEy^*DjxUc!<*}?$J=dkU2L@qabvY?R^0)E z402Fp@uuI!{IP1C0k7KUbRv`0iOu!ZUk32E#ln?1eEX+S96GLV{`k8n&piU1KZ)|< zX`osML^%L3h$98CaAc3IBdOZ3!e@74S_#Dd9UqpHKzXoUrQAk-kxcX(s=Hn=zIe}v3wJ46g2^cMVix-PW>t)`p zNB$W5FW&A)$VW1e$1{DPRxG5TA&n9<7_Kiu)B?N_ab(-p2N=8xxK`>5sGWqP^_#f z3~b~4i91nVc(OXXr<&|FF>$pQ0;B8SsRQ`Tmr;J_fg0fX#Vc`W`38)RycBbzrAz=9 zJT;vxL6@RMbr*6(4g8OEoWtmS0)(gWWO8Q=dio?7u56 zVPTKcJ$Xmd(u&%xYLWTKPyI8BL&roL<+-n+eDb0Cc>d4|Mu)FWexa=v8?v;67@D2K z_4-8chF(Xh@uai&%$4kHoyGY4Q}uCi-JK{_UMK38TW4_o^KY%aGJr#sCw^0PH2;zx z^#WXN+9?0;AM3-J0c`fX9#2JPo7`bW5!&Hxnx^em&zwi*7gsPkvd2>S)IZg8ElH{u zA@f(=+GxCGZht>8=B|E&w}Is|pRZki760Y~nCZ!2c!jKjN(dROMBzkGT^68~`K)@r z8@d8{5?Y)-;n%;!>m3!uudfqVenc)+dEsgq4Zy+`9*-R?8Q~Sd)ksPZxrT+p~L?S<1%-URS`I#PZxxR*gV;nkOl z1;FgnNgzeFM}2X*=BzyTb@@t{CcNHQL3|DN;|x*GpR9AMWwf;7^S%-APMv6MBp8^Y z@c-f}2)L#MF!$t@Cw%Sm# ziX<8^jh#}v8ql`Il_@Ue7nCZQ=;W83Lw$L@G<;QWe#Ozh#Orbe@xp$pT+#O4H+)5s z{lqZ<_5^P#U_*tf-wU<|Mg+p_D+@4$o1~cA=WFMJr`VX4`@C~3%s#Ii1M+^|<&L^UuJ^-?NFW*@Oa-qA+MJ%5vn{~jww;AK z#=CMrI^{BWWQ+6!aSrdB6W$qz5)+}?!NAd6Qwo@^UO6bvPA5G;oCx4h=qFj3z)cZ5 zt0!^rhYH@1BL>P@gcp9v3~>m+A>KC>UITzRCwiQ1^+XOb&?cBeyz*>8&IoY=7_-2u zfHBA9bs~nrG_6nwK*zvblteZK)r4FCTVWT<`1GQkbla1Fz?%}>7|=C?M}!QdhmH*!2;JcD!U}S@L_i!E*X97&3U4sDsV812SCT4-Uuy5YGbO z81HL^R|+#U%N*$2BCWPg@MGOZJ9ykus8qu{kbn*wm{iw!uQR$8TKrBCT5 zh=EmcvZAh7diNz9Vlg~$^%Mi`gEKX}WR@XD_DS##w287uH(*l7h8V6*MGVX?*Ew}p z%Wt9@7gp#c3}SN}Ea;$5fCJ-WGAqCX`^u1y=}D$*tedBegNsnFY|JN=2s) zjs(;TaB6rpAxtI_y*B}Er_DZ?wO%f)=+y}h5y|E%L?!>AJn6+N{K!6+ucKkZAN+$+jtM@I4WMAl$0^AVD z6%!*$x8t29m^Djn9PF-VPXx01nst(P7aLiB&j3fmYrILL9CYJZ+i98=4DLk*2Pr&D zZHDk7#bhsWSdnfQoA_u~lt*rWW8kH{yGK_PVo==^_GJcWSXD4U}+-1j}TM3+Bp}gi63JwW*jnFb<9ZIZ0Tdmo&TB3eaFpooWFl>R|zn@xB7Q zny@H~xOD`)&}d()&nvTWuy1vvQH=z7>P1L6*zv0qL2{7$5tR*)cN2 z!6bODJ_obb>nig=!3rTSPkh|NH+B}?SpXdI7SHOOrO?DXxpM)92WASiOdv~ji;^a+ zh+ASadtq&!7GQ1opn+Ebt_W>NxIx9hP{zT~uLHvc84i#wTOlAvg%y-Hwu$=(%Jo8m zlmcL4K-4!Od0R zd90}c)_7m;I*4>N^gffVfg>k3!ZOjHNeldIGGPjC)oj4YKUY=}bD6=QE& zA}4l+ip^m}PJn&wcL8z1mBa;{`YFnHfRtriICAtQduo80c6e_dCOyQV zbYe;}qjlY7E4v_c3x6C;<~1swi5@FHdx7PZl5Q6p=Y@LK9iAIp$-dIQ)E9XyZe_Nh8P)=CpL zXeV~QiK%pBdcp%h5g)tlOCjNQ5=`u3y)YOZWgWo)w+}V&YQZfOKSlY1YCi>Y$TeC( z=GsUl897Mw6?yt4HdAp!7{Q%$kM$^kTZg2Fo>Fjr8qt>HV0Lx1*GlMlJ*xr!XePr9 z#CzfpFHG7IbiETpMaNIsqu?x@e6Fopk8Bmmu5X2c3NL)e5c;o4rt*Ej_V0~*{sZM6 zSoMVo4@9MFyohry!pk))Vj$Fi?Wk$LXHqxGFBB87b~d5!6|Ro(?g){D>%^M$7%!|0 zJwgFyy)WY(o84fsoH=asTta|3 zV5l~!+Qt2(ViL@R{nQ{!?cy^T`vyCajv&qI1S^qVm^^2~2(KL|h#c^`0vGR1u3OVG<d)Vc>B&~eM32%{g^E3w&;t#S07dg#xU8oVRqXp2Rw#(|&r@$Y^4T*0>}yx5l?kss=B8ouEx@+36#eXLmnA=F&p9t)5Ss?iG7*!_=xlhriDX#g zeZ8@v_Q#p9w!zwe%D%GpA8W(FN}yB76i$TPsZD2SJb|YUbr|6T7}NPlCwM|RjaQD| zOG33rN|VM%vSG;&lXRc#2Za(bUW7{X#d#3`lXg=LiU6~^T^f)XT`oW5X(pz%v(tqX zc8JXr7-br3n@MABaAmaO16YDLHk{CeFOk<~?l;ZNB{a?afU;j-k1sncX(8oOc;OI$ z95B`VN_0`CTKWMx zuO}AUs~MyOX(4f)3SbUgV<^#qS*SPJszib`OPG__5hwaQ$r8tSRWrft9;;t}3IKP~ zt*)4=CJ z9Vdo3^K&DW2QhmyFtMaWf+CdQ?D#+qYJY56N=a)!^Xdd5?n+4~!`*NCFp>jObi9w$V*1eQj6J}UF|wk)$=7gG-AMT) zAH+eOW}P(j6pwXcVB*{o8h2o3>?e=um1)VxDX&A0|71VvZq#@pg|5|hN0sw-zQ?=d zr4{k824tyC(IJIF-}@vAlmsgjJ%$rGA3aLjQR}Qs26?kdk9`gfLm1#wRKtA$#w3Bv zXct>d`M?-CS|m?utytsbGF(J#44idb!{uO1>|!LkU$vnGJb5X?9c`Vd!ns}@W;U4t z#68AwK{lwOJ}>MGA2h29LVgrzxo)@=x@jaK#Fx`8ooO;Ur9(~5v}Hr(#WDudGJ~y{ zu1f3#Yu0iwl$>JIK;-@dB7U9b_3G&MD15 z9@6u_68U12%NXK=N=7N3UN-H%j3hI}ijL9#@sR`D$FU7NpckfXmTLU+USmRtFQ+>> zrmfmRbM>gSQ2RN`_ATk!I)iY+(s=8IQu+~{Rdx;-vs@je2VUy$IurR(cZg=%;zx0C%jZH1`e1v@P~;!My+`otYrc87FGu?8xf1MuR79zR91(mO)e|Bl|ws zcDVHDiF4la+R35T(`wYXN4+n6-~eXIsJku1J0E~CNg#m`r+SH|Od&-Rp*BJ0(+pRQqGoQc7C;89i}= zyWbQh*i7q$0l5<+hgRg2EfoN#xD3gpxgUF)mk1I8u_6xh6w@oDO0#-1s%|buw!lp2 zk})uGZuY`C`_rC1ZAugG`z3EoY`KHU8zDiOx^DtOW?@!_6jMoo087H!j!g6Rk-e#* zk^$nxj}r5v&{shD1W|$Pz-)EIrJEqsr*5ml3-=b1^%GXiU@N93Eu@@~-+^267}k0l zhe)*}mdH1>LjqXsh5H<*^kRqDx;AL?q=rs0dtM6#xNobn2 zxdCg>k)BxjXm)kQG)b)wZ%o)>Z?04xhOuR8R|YSvzPy03O*E;)>~^t99aj=M#!ljZ zjRjeR+3a#;c#{Jxcwx#uRUX{a3 zrjh(;~$A%PAJ~ddO-i7nVP+SA!l~e50xgzfyl*JLYOp;|F>zd!W0FA@vRS6Chy6!H z+L^ARl((N&Hh&a`(5?TcNhj=AgVy3KN9YV)vs-( ztFy$0ZV|&>-pN*agGqMo9FX-KA79(xSv!^ z^7@2*31CxSSiGmywm@$l8HNQwEO{eedH~$qx-nNK24t;QZrYV%g~B?)YpyXhz-&6x z|5Vj(zNlnP=cT`iT_Yv~Gb2W3G@QcAK)-*mU!JUb&r_16nGo1K7kj`FrjNC z{*(Qv;)YOwJLev&tj8*yL%}`?yQ}N|G@>o%!pXE(eXWEZmoC{8Ly{N?GmvI=BE%b$ z?G-K}dar;LWDaIuM^k`WKraP&V*ob52%m=}^3=A{dSN8{JSj>vp0(-p)F8J8lk~V0 z%od=v;()7y*S+Q(0BgK$CJqdeZelm}cB^bnl$dk~6EJaN7Ge*3=bb#at-eVerghr~ zA%D_<9XBDo=wvgGfA$Fz3vi4_Pw#~h53vgbr$)WLHI#StC3_^uio9Bi)*%HmKmzS1 z2Z`eGEyC;SS>SF|D1bHMv*(kz&P%vXEIsap^4>7OcY)NSR+}e;4`qA6rE7728qt<3 zFSXgy?hx}kEQ9q6=MF-0{F@X!|*(hZ{pnQK1*^Q&th0VbXrtHxII%JaJvbd*Fluq$#D7yUdFEAPm_lgHz-i&7bTb0%t6P-F8-HH{A&&9JuBrrDB9JQ)y>ep@ z49t{1rQ=Vw3Foz}@KR+G0W8JAJ$PXxTVgA%pT8R*_ks-n@>wX%Q`v3@hwS+AiSLF; z0dFgfydfljUDcQ{LNhPXN#f6wQh`j^@p)a}^4a8uqddQ>4`-lVpdoa+aw$=*VtjN5 zdtYmQB)|zJ-7dDtVMKhK3}hz17RoC_fEfE8l6E3u2MhMW9 zZYt4$E7h%uZ7;iC)43@pcbYgk1H7zG zCV)jR9OeiTPV8n4GL_HiKo2u0pxrVVgCWb;Bbl9ipf2qX8|%i9@p|hg9srg zkXW!IBzTusDtIYdeF04A=_GO&n-*l&!2W40$S`O~$gZA82TG9Pds$(KgUeRB*E_rUZDDki0xRg2Ogg0>46jy)DC1R& z0~jWViv^(E2FhKaa5uksLI$ml#^YMNGNh%pR(i?7+=z4o=8lVf-c1WHr<)33jaN44 z6!SzLE&8pP3rF^BemSK-5QinsXicr@iS!zp3^u5qO zQ%RvA1~X>fFru4P?(Xw7f0);IL=ADVcxMGk%WlY+qw7 zdN4q$@(l36>;r>)3E->m176 z?S4Rp^6uAqk|y2zwFV~+SS16u=~oiKYTMu@8R1P9|F+U104{gOHD48H#qw*2vb5+u z@n{9b@-6k@_VcG{onAps0CN=3oWAvEweKcLZMDKXD}eW;;i_0!1x7ESl?X9?V^8_vGHqBT=UcQ zaSihMQz&;Y3MFDdX3{KSgLeQW&)NoBJF%neD++Yf-B?*u(9JT!8x=lybg7)(t(u<+ zz{lT=V&!$L{#4mZyq>FGc03K>s&eZLiqVS7Kymd?)OSmH>a+DDp!&@(F4wn&y2B%^SO=wT*`= zw_HB|6vqGiiD3i>Ij}PR_NP!jf2wNU!%J%$55Rft{Fl{##@~29%8Snoqd3TclWJ{v z{Mes2&HC%+U;^>d+QugVe6rmBJ}z$j;ocV#;u@#&3`VBU_KY4?EACsG4(fpVNs+_GA6x(PCr$15 z?DIJ#j`}+=Ys}ia!8v;Q+3rSX$cIfA#AzfAt$MxBP0%RoghLU2O|j4x>7VDD^Vg_#AdOAII*wN9xTy zJ7>Pqe#-w#wGOlkp?d)Q8i2PALp4ZZ`80r!?!U88Nf5-1Y_6|fvG0|u zuljBUa1($kzR-OhGRTWr&H^~I|3OBz9j#gbu3jVW{mUs94%b)l|0Ia+Wc%1sBme*a M07*qoM6N<$f)i;O@!tlzXA001~( z!jMtc6n<~pwbnWPy1)+rSPQ`*gJUlIr5%-$Tv9zGIw^0>d2@01UuBr;7E& zK@-6&FNWa`J27D1hv+o$`Bb@u#eQI>v-rKpCpb9>L-IS()-l3(1}#iJz41JYoFIS9 zaNJMye_@A_K$JV;ju8#qFgTRxJQ5nBypjEj+*~x^z721=Pz0u+D>5px_mFgM3KG^r zWA6>UULCMqJzRiIO2d*F6SAn2UE{Z=%Me18M~W)#-X*|zFy@7YU=8V z8oh`j3+DdL1rsh4PjXOV{`-?O=}c%)!h*<9y|14qbIB`97TkRhU>plbF~?7)*WSLP zS>=q5{;*kMU!y0@urEDe}goy%0RCTB39n?A*yQYrgaJhBxn|s!`lRdZDCas~P zF@3Q60NLt{P(w$^|Mg$pKn06lHcOo_a`dk-bf5nk=j@=rvz?Zm5?+ZS6YfoBP- zw30>&G@^Ny>-zqjy_JK??0guC+%-||yZ0PV)J}mWMJxsTBFT@u2@cWdXp~q(?Tj1# zR;C{6|IMU7UWA3~l@;#%KAwfDkGGS-h!Y9SWnS~_|<@Gln8(0h9 zG+T&~y6pO-5|Z`RMV(fv>u6L4&|VY*vbr+hRR1`aB$w7bU1yaJ6nd@76*QVfhj!2M z#ynTTCNFuDxBQr@!EYzho8|yVB=bqK7UmS}7DUMT11*lV4H%FK85oX)LZt6nUDQ0xnr=^BiQ@@3)WDM;ltfbo|?*!-{HCkvfux%rEGK8op4kzI>v{J0e&JZOTxa4XD;k_R`J zS1-oM@m!8?_POVHN3XPc>9l=!vZ1eW+4TpW_2&ItS(-xr!wA=0s#}_NZ z@388JTs4g!zDT7tl^})+=N*z@e1npYfrHiOo9P>Jwt5kl`9u3$oeL$Ah@6|<#rzPt zvrBPm4pzPa", @@ -6096,7 +5955,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 275 + "__id__": 269 }, "_contentSize": { "__type__": "cc.Size", @@ -6124,7 +5983,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 277 + "__id__": 271 }, "_alignFlags": 45, "_target": null, @@ -6160,7 +6019,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 279 + "__id__": 273 }, "_id": "" }, diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts index 18da1f06..617c32ad 100644 --- a/assets/script/game/common/SingletonModuleComp.ts +++ b/assets/script/game/common/SingletonModuleComp.ts @@ -32,11 +32,11 @@ export class SingletonModuleComp extends ecs.Comp { vm_data: any = { name : "数据测试", /** 当前等级 */ - porwer: 0, - /** 当前经验 */ - def : 0, - /** 下级经验 */ - speed : 0, + cards:{ + level:1, + level_max:10, + eid:0, + }, hp: { min:20, max:30 @@ -46,18 +46,15 @@ export class SingletonModuleComp extends ecs.Comp { max: 30 }, gold: { - min: 0, - max: 10 + min: 3, + max: 3, + time:0, + cd:30, }, shuaxin: { - min: 0, - max: 2, - speed:1, - }, - gold_add: { min: 0, max: 10, - speed:2, + speed:1, }, }; diff --git a/assets/script/game/common/config/CardSet.ts b/assets/script/game/common/config/CardSet.ts index f41c19f6..327b7e5a 100644 --- a/assets/script/game/common/config/CardSet.ts +++ b/assets/script/game/common/config/CardSet.ts @@ -8,12 +8,13 @@ export const CardSet = { 1001:{ uuid:1001, - name:'嬴政', + name:'护盾战士', level:1, prefab_path:'yinzheng', - hp:100, - power:100, - speed:100, + atk:2, + hp:10, + power:50, //每0.1秒增加1能量 + speed:50, skill:{ } }, diff --git a/assets/script/game/map/CardController.ts b/assets/script/game/map/CardController.ts index 552eb4f6..1e15e2df 100644 --- a/assets/script/game/map/CardController.ts +++ b/assets/script/game/map/CardController.ts @@ -50,6 +50,7 @@ export class ControllerComp extends CCComp { card.load(pos,1001,cards_node); x=x+120 } + this.node.getChildByName("cards").getChildByName("active").active = false } /** 转场 */ protected update(dt: number): void { diff --git a/assets/script/game/map/view/MapViewComp.ts b/assets/script/game/map/view/MapViewComp.ts index 5e501da7..f12866a4 100644 --- a/assets/script/game/map/view/MapViewComp.ts +++ b/assets/script/game/map/view/MapViewComp.ts @@ -60,13 +60,10 @@ export class MapViewComp extends CCComp { } gold_add(dt: number) { - smc.vm_data.gold_add.min += smc.vm_data.gold_add.speed*dt; - if (smc.vm_data.gold_add.min >= smc.vm_data.gold_add.max) { - smc.vm_data.gold_add.min = 0; - if (smc.vm_data.gold.min < smc.vm_data.gold.max) { - smc.vm_data.gold.min = smc.vm_data.gold.min + 1 - } - + smc.vm_data.gold.time += dt; + if (smc.vm_data.gold.time >= smc.vm_data.gold.cd) { + smc.vm_data.gold.min = smc.vm_data.gold.max; + smc.vm_data.gold.time = 0; } } shuaxin(dt: number) { diff --git a/assets/script/game/monster/HeroCardViewComp.ts b/assets/script/game/monster/HeroCardViewComp.ts index 48e3438f..e919bc21 100644 --- a/assets/script/game/monster/HeroCardViewComp.ts +++ b/assets/script/game/monster/HeroCardViewComp.ts @@ -3,7 +3,8 @@ import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ec import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; import { data } from "../data/data"; import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; - +import { smc } from "../common/SingletonModuleComp"; +import { CardSet } from "../common/config/CardSet"; const { ccclass, property } = _decorator; /** 视图层对象 */ @@ -39,22 +40,40 @@ export class HeroCardViewComp extends CCComp { } onTouchMove(event: EventTouch) { + smc.vm_data.cards.eid = this.ent.eid; + let parent = this.node.parent; + let active = parent.getChildByName("active"); + active.setPosition(this.node.position.x,this.node.position.y) + active.active = true; + console.log(parent); + // if(this.ent.eid == smc.vm_data.cards.eid){ + // this.node.getChildByName("active").active = true; + // }else{ + // this.node.getChildByName("active").active = false; + // } console.log("onTouchMove"); let delta = event.getDelta(); this.node.setPosition(this.node.position.x+delta.x,this.node.position.y+delta.y); } onTouchEnd(){ - if(this.node.position.y-this.pos_y > 50){ + let parent = this.node.parent; + let active = parent.getChildByName("active"); + active.setPosition(this.pos_x,this.pos_y) + if(this.node.position.y-this.pos_y > 110){ + active.active = false; this.use_card() }else{ this.node.setPosition(this.pos_x,this.pos_y); } - console.log(ecs.query(ecs.allOf(HeroCardViewComp))) - } use_card(){ - oops.message.dispatchEvent("do_add_hero",this.ent) - this.ent.destroy(); + if(smc.vm_data.gold.min >= CardSet[this.card_uid].level){ + oops.message.dispatchEvent("do_add_hero",this.ent) + this.ent.destroy(); + smc.vm_data.gold.min -= CardSet[this.card_uid].level; + }else{ + this.node.setPosition(this.pos_x,this.pos_y); + } } /** 视图层逻辑代码分离演示 */ start() { diff --git a/assets/script/game/monster/MonsterViewComp.ts b/assets/script/game/monster/MonsterViewComp.ts index dbb8f3d9..2054d2e6 100644 --- a/assets/script/game/monster/MonsterViewComp.ts +++ b/assets/script/game/monster/MonsterViewComp.ts @@ -27,36 +27,41 @@ export class MonsterViewComp extends CCComp { /** 角色动画 */ as: MonsterSpine = null!; hero_name : string = "hero"; - /** 角色阵营 1:hero -1 :monster */ - camp: number = 1; - /**角色类型 1:近战 2 远程 */ - type: number = 1; - /** 状态 1:move ,2: act 3: stop */ - state: number = 1; - /** 血量 */ - hp: number = 100; - hp_max: number = 100; - hp_speed: number = 0; //回复速度 - /**能量**/ - power: number = 0; - power_max: number = 100; - power_speed: number = 1; //回复速度 - skill_name: string = "base"; - max_skill_name: string = "base"; - /**攻击力 */ - atk: number = 10; - /**攻击速度 */ + camp: number = 1; /** 角色阵营 1:hero -1 :monster */ + type: number = 1; /**角色类型 1:前排 2 后排 */ + state: number = 1; /** 状态 1:move ,2: act 3: stop */ + + hp: number = 100; /** 血量 */ + hp_max: number = 100; /** 最大血量 */ + hp_speed: number = 0; //回复速度 + + power: number = 0; /**能量**/ + power_max: number = 100; /** 能量最大值 */ + power_speed: number = 1; //能量回复速度每0.1秒回复量 + + skill_name: string = "base"; //技能名称 + max_skill_name: string = "base"; //大技能名称 + + atk: number = 10; /**攻击力 */ // atk_speed: number = 1; - atk_cd: number = 1.3; - atk_time: number = 0; - /** 角色移动速度 */ - speed: number = 100; - /** 角色初始速度 */ - ospeed: number = 100; + atk_cd: number = 1.3; /**攻击速度 攻击间隔 */ + atk_time: number = 0; /** 冷却时间 */ + + speed: number = 100; /** 角色移动速度 */ + ospeed: number = 100; /** 角色初始速度 */ Tpos: Vec3 = v3(0,-60,0); - stop_cd: number = 0; - private timer:Timer = new Timer(0.1); - is_dead:boolean = false; + stop_cd: number = 0; /*停止倒计时*/ + + private timer:Timer = new Timer(0.1); //计时器 + is_dead:boolean = false; //是否摧毁 + + /*暴击*/ + crit_rate:number = 0; //暴击率 + crit_damage:number = 2; //暴击伤害倍率 + /*闪避*/ + dodge_rate:number = 0; //闪避率 + shield:number = 0; //护盾量 + shield_time:number = 0; //护盾持续时间 /** 视图层逻辑代码分离演示 */ start () {