From bcd3eda4f1dc3f4c7912ea7acac264e196d61154 Mon Sep 17 00:00:00 2001 From: Kengo Nakajima Date: Mon, 25 Jul 2011 07:35:52 +0900 Subject: [PATCH] adjust enemy --- cli/fpstest1/Assets/ControlerScript.js | 4 +++- cli/fpstest1/Assets/FireballPrefab.prefab | Bin 11142 -> 16981 bytes cli/fpstest1/Assets/MobballPrefab.prefab | Bin 2034 -> 16995 bytes sv/actor.js | 7 ++++--- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cli/fpstest1/Assets/ControlerScript.js b/cli/fpstest1/Assets/ControlerScript.js index 5bd784b..812fb91 100644 --- a/cli/fpstest1/Assets/ControlerScript.js +++ b/cli/fpstest1/Assets/ControlerScript.js @@ -195,7 +195,9 @@ function OnGUI () { if( prevSel != selectedInventoryIndex ){ herosc.SetToolTex( shortcutTextures[ selectedInventoryIndex ] ); } - if( Event.current.keyCode == KeyCode.X ) attackKeyHit = true; + if( Event.current.keyCode == KeyCode.X || + Event.current.keyCode == KeyCode.N || + Event.current.keyCode == KeyCode.E ) attackKeyHit = true; if( Event.current.keyCode == KeyCode.Return ) enterKeyHit = true; } diff --git a/cli/fpstest1/Assets/FireballPrefab.prefab b/cli/fpstest1/Assets/FireballPrefab.prefab index d0a080d67eab7dad2da837e4fce8e8237e5494cd..5aae81ad0964c0812563c6ab850d6bfed1b3924f 100644 GIT binary patch delta 3297 zcma)8U2GIp6uz^irCoO0Zg*SS-Ii{h!ViOo1Y8?M4>*IBT_$ALY4`qT^KYZ&<8znA|hz2wgi z5)D9Mp_NCyaah_l1jf5}?(D?@`av-gBa9_Rz&Kp%i1LGX?;PF>qQ(j^S-BUgfE}zn z8kIbJuM{K4JBQef!xhWo~4U$Zg zmu%TFl<~$uM0$(w3dE(i`Bx2bX_}vf_v55H;;r(}tJZ{iMj@6HAZ_Kp2O6Z4Jn3(j zPVpT4Ci!RZdzznW=#^w*N)c0<2YkV`KN{Yv-htUME*qAb&M3oKRg*2k{u0#9M5mjfkDvu!%S3?H9a$dwsSMac!x` z8xs!*Vy9>~;;ly}-2eab_(ee+pyk|Nc+%pBD%*@D0gFXdE| zx=PUIrEo_X!|IyN=(5F@C~ToJJx+ywne>h8>d%l~G!VO*qXLXR<;bawo|ZEOr);0L zmT{K*)Lf>=X|Yc&>*|G1*g>KHmO3Q}Oen@fhR%;vhk359rq;;Lyrvszh0dy#%Ce2h zavPQ<|Ft?4a!+{H1x69byK6%HpK71fNfjIevljo1tSzY7IXapy>;f$*UC%Jn(ibLF zZ81a9p~UFsQcv(wTjdFP(b8uW(=ry*7HPH@Z_j?mygQi5s0*g9&N#i`pr%@uVz+|# zZ6y9tcIFw|3awyS+KD(~cIudtAt4OJxoB$E?NeU2dqKBzrCS_n9bgY;6=O~$h_4`* zmx|fGHIk(HerDJO0o``7(Olmeb6YWCR7_^4sdB}^w?7L&dQkYU53q62`b}U{Q z8EMI}tTHjLizMx~RRkLn6E{v;(yanI#X_y{d4H1>r-1cPz@Ec^b!*8{NUrs7 zY8ehLdpUL+gn0m9KgA)#4LAXDE+#zP9AgV0I{*1sEmfA{0K#O`R4j9crl(SJW?yE(P-f*+pZH_m?=G8jpB^#4eEGo_<_`}qz-CGf OO7Z-s-gbVg_tw7{z?k^} delta 549 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 delta 91 zcmaFd!uW}whk=2;4v0T7FfedTE@V`gT)@OJ`GXzHEBre afV2Y;zhs8sg+Q?YAYTQDUjfBH7z_aWR}+x{ diff --git a/sv/actor.js b/sv/actor.js index 04c03e4..1f59760 100644 --- a/sv/actor.js +++ b/sv/actor.js @@ -208,6 +208,7 @@ function ghostMove( curTime ) { main.nearcast( this.pos, "smoke", this.pos.x, this.pos.y, this.pos.z ); return false; } + this.velocity.y = 0; @@ -217,7 +218,7 @@ function ghostMove( curTime ) { this.pitch = this.pos.getPitch( diff ); if( this.counter > 100 && ( this.counter % 100 ) == 0 && this.hate ){ - var b = this.shootAt( "fireball", 8, 10, 2, 1000, this.targetPos ); + var b = this.shootAt( "fireball", 8, 5, 2, 1000, this.targetPos ); b.sendMark = false; main.nearcast( this.pos, "fire", this.pos.x, this.pos.y, this.pos.z, "fireball" ); } @@ -232,7 +233,7 @@ function ghostMove( curTime ) { } else { this.velocity.y = -1; } - + if( this.counter < 100 ) this.vForce = 0; @@ -621,7 +622,7 @@ Actor.prototype.poll = function(curTime) { // 送信. 落ちてる最中ではない場合は、あまり多く送らない var toSend = false; - + if( this.counter == 1 ) toSend = true; if( this.lastSentAt < (curTime-500) ) toSend = true; if( this.velocity.y != 0 && ( this.lastSentAt < ( curTime-50) ) ) toSend = true;