Minor fix.

Drafted bullet explosion data structure.

ConcerningEdgeCases.md

@@ -47,3 +47,23 @@ renderFrameId             |   toApplyInputFrameId
 ..., ..., ..., 368        |   90
 369, 370, 371, 372        |   91
 373, 374, 375, ...        |   92      
+
+# Would using UDP instead of TCP yield better synchronization performance?
+Yes, but with non-trivial efforts.
+
+## Neat advantage using UDP 
+Let's check an actual use case. As soon as an inputFrame becomes all-confirmed, the server should downsync it to all active players -- and upon reception loss of the packet containing this "all-confirmed downsync inputFrame" to a certain player, the server MUST retransmit another packet containing the same inputFrame to that player. 
+
+To apply UDP on this use case, additional `ack & retransmission mechanism` would be required, which is a moderately difficult task -- don't just pick a 3rd party lib using TCP flow-control alike `sliding window mechanism`, e.g. [RUDP](https://www.geeksforgeeks.org/reliable-user-datagram-protocol-rudp/)! Here's why. 
+
+Assume that the server is downsyncing `sequence of packets[#1, #2, #3, #4, #5, #6, #7, #8, #9, #10]`, when using TCP we get the advantage that each active player is guaranteed to receive that same sequence in the same order -- however in a bad, lossy network when `packet#2` got lost several times for a certain player whose reception window size is just 5, it has to wait for the arrival of `packet#2` at `[_, #3, #4, #5, #6]`, thus unable to process `[#7, #8, #9, #10]` which could contain `unpredictable inputFrame` while `#2` being `correct prediction` for that player.   
+
+That's so neat but still an advantage for using UDP! Yet if the TCP flow-control alike `sliding window mechanism` is employed on UDP, such advantage'd be compromised. 
+
+To summarize, if UDP is used we need 
+- an `ack & retransmission mechanism` built on top of it to guarantee reception of critical packets for active players, and 
+- reception order is not necessary to be reserved (mimic [markConfirmationIfApplicable](https://github.com/genxium/DelayNoMore/blob/v0.9.14/battle_srv/models/room.go#L1085) to maintain `lastAllConfirmedInputFrameId`), but 
+- TCP flow-control alike `sliding window mechanism` should be avoided to gain advantage over TCP. 
+
+## Additional hassles to care about using UDP
+When using UDP, it's also necessary to verify authorization of each incoming packet, e.g. by simple time limited symmetric key, due to being connectionless.

README.md

@@ -1,25 +1,31 @@
 # Preface 
 
-This project is a demo for a websocket-based rollback netcode inspired by [GGPO](https://github.com/pond3r/ggpo/blob/master/doc/README.md).
+This project is a demo for a websocket-based rollback netcode inspired by [GGPO](https://github.com/pond3r/ggpo/blob/master/doc/README.md). As lots of feedbacks ask for a discussion on using UDP instead, I tried to summarize my personal opinion about it in [ConcerningEdgeCases](./ConcerningEdgeCases.md) -- not necessarily correct but that's indeed a question to face :)
 
-_(the following gif is sped up to ~1.5x for file size reduction, kindly note that animations are resumed from a partial progress)_
+The following video is recorded over INTERNET using an input delay of 4 frames and it feels SMOOTH when playing! Please also checkout [this demo video](https://pan.baidu.com/s/1ML6hNupaPHPJRd5rcTvQvw?pwd=8ruc) to see how this demo carries out a full 60fps synchronization with the help of _batched input upsync/downsync_ for satisfying network I/O performance.
 
-![gif_demo](./charts/jump_sync_spedup.gif)
+![gif_demo_1](./charts/internet_fireball_explosion_wallmove_spedup.gif)
 
-Please also checkout [this demo video](https://pan.baidu.com/s/1Lmot9cb0pYylfUvC8G4fDg?pwd=ia97) to see how this demo carries out a full 60fps synchronization with the help of _batched input upsync/downsync_ for satisfying network I/O performance.
+![gif_demo_2](./charts/jump_sync_spedup.gif)
 
-The video mainly shows the following features.
+All gifs are sped up to ~1.5x for file size reduction, kindly note that animations are resumed from a partial progress!
-- The backend receives inputs from frontend peers and broadcasts back for synchronization.
+
-- The game is recovered for a player upon reconnection.
+# Notable Features
-- Both backend(Golang) and frontend(JavaScript) execute collision detection and handle collision contacts by the same algorithm. The backend dynamics is togglable by [Room.BackendDynamicsEnabled](https://github.com/genxium/DelayNoMore/blob/v0.5.2/battle_srv/models/room.go#L813), but **when turned off the game couldn't support recovery upon reconnection**.
+- Backend dynamics toggle via [Room.BackendDynamicsEnabled](https://github.com/genxium/DelayNoMore/blob/v0.9.14/battle_srv/models/room.go#L786)
+- Recovery upon reconnection (only if backend dynamics is ON)
+- Automatically correction for "slow ticker", especially "active slow ticker" which is well-known to be a headache for input synchronization
+- Frame data logging toggle for both frontend & backend, useful for debugging out of sync entities when developing new features
 
 _(how input delay roughly works)_
 
 ![input_delay_intro](./charts/InputDelayIntro.jpg)
 
-_(how rollback-and-chase in this project roughly works)_
+_(how rollback-and-chase in this project roughly works, kindly note that by the current implementation, each frontend only maintains a `lastAllConfirmedInputFrameId` for all the other peers, because the backend only downsyncs all-confirmed inputFrames, see [markConfirmationIfApplicable](https://github.com/genxium/DelayNoMore/blob/v0.9.14/battle_srv/models/room.go#L1085) for more information -- if a serverless peer-to-peer communication is seriously needed here, consider porting [markConfirmationIfApplicable](https://github.com/genxium/DelayNoMore/blob/v0.9.14/battle_srv/models/room.go#L1085) into frontend for maintaining `lastAllConfirmedInputFrameId` under chaotic reception order of inputFrames from peers)_
 
+![server_clients](./charts/ServerClients.jpg)
 ![rollback_and_chase_intro](./charts/RollbackAndChase.jpg)
+
+(By use of [GopherJs](https://github.com/gopherjs/gopherjs), the frontend codes for dynamics are now automatically generated)
 ![floating_point_accumulation_err](./charts/AvoidingFloatingPointAccumulationErr.jpg)
 
 # 1. Building & running
@@ -27,7 +33,8 @@ _(how rollback-and-chase in this project roughly works)_
 ## 1.1 Tools to install 
 ### Backend
 - [Command Line Tools for Xcode](https://developer.apple.com/download/all/?q=command%20line%20tools) (on OSX) or [TDM-GCC](https://jmeubank.github.io/tdm-gcc/download/) (on Windows) (a `make` executable mandatory)
-- [Golang1.18.6](https://golang.org/dl/) (brought down to 1.18 for GopherJs support, mandatory, in China please try a mirror site like [that of ustc](https://mirrors.ustc.edu.cn/golang/))
+- [Golang1.18.6](https://golang.org/dl/) (brought down to 1.18 for _GopherJs_ support, mandatory, in China please try a mirror site like [that of ustc](https://mirrors.ustc.edu.cn/golang/))
+- [GopherJs1.18.0-beta1](https://github.com/gopherjs/gopherjs/tree/v1.18.0-beta1) (optional, only for developemnt)
 - [MySQL 5.7](https://dev.mysql.com/downloads/windows/installer/5.7.html) (mandatory, for OSX not all versions of 5.7 can be found thus 5.7.24 is recommended)
 - [Redis 3.0.503 or above](https://redis.io/download/) (mandatory)
 - [skeema](https://www.skeema.io/) (optional, only for convenient MySQL schema provisioning)

battle_srv/models/pb_type_convert.go

@@ -38,6 +38,9 @@ func toPbRoomDownsyncFrame(rdf *battle.RoomDownsyncFrame) *pb.RoomDownsyncFrame
 			BattleState:       last.BattleState,
 			CharacterState:    last.CharacterState,
 			InAir:             last.InAir,
+			OnWall:            last.OnWall,
+			OnWallNormX:       last.OnWallNormX,
+			OnWallNormY:       last.OnWallNormY,
 			JoinIndex:         last.JoinIndex,
 			BulletTeamId:      last.BulletTeamId,
 			ChCollisionTeamId: last.ChCollisionTeamId,
@@ -52,62 +55,74 @@ func toPbRoomDownsyncFrame(rdf *battle.RoomDownsyncFrame) *pb.RoomDownsyncFrame
 
 	for i, last := range rdf.MeleeBullets {
 		pbBullet := &pb.MeleeBullet{
-			BulletLocalId:           last.BulletLocalId,
+			BulletLocalId:           last.BattleAttr.BulletLocalId,
-			OriginatedRenderFrameId: last.OriginatedRenderFrameId,
+			OriginatedRenderFrameId: last.BattleAttr.OriginatedRenderFrameId,
-			OffenderJoinIndex:       last.OffenderJoinIndex,
+			OffenderJoinIndex:       last.BattleAttr.OffenderJoinIndex,
+			TeamId:                  last.BattleAttr.TeamId,
 
-			StartupFrames:      last.StartupFrames,
+			StartupFrames:      last.Bullet.StartupFrames,
-			CancellableStFrame: last.CancellableStFrame,
+			CancellableStFrame: last.Bullet.CancellableStFrame,
-			CancellableEdFrame: last.CancellableEdFrame,
+			CancellableEdFrame: last.Bullet.CancellableEdFrame,
-			ActiveFrames:       last.ActiveFrames,
+			ActiveFrames:       last.Bullet.ActiveFrames,
 
-			HitStunFrames:   last.HitStunFrames,
+			HitStunFrames:   last.Bullet.HitStunFrames,
-			BlockStunFrames: last.BlockStunFrames,
+			BlockStunFrames: last.Bullet.BlockStunFrames,
-			PushbackVelX:    last.PushbackVelX,
+			PushbackVelX:    last.Bullet.PushbackVelX,
-			PushbackVelY:    last.PushbackVelY,
+			PushbackVelY:    last.Bullet.PushbackVelY,
-			Damage:          last.Damage,
+			Damage:          last.Bullet.Damage,
 
-			SelfLockVelX: last.SelfLockVelX,
+			SelfLockVelX: last.Bullet.SelfLockVelX,
-			SelfLockVelY: last.SelfLockVelY,
+			SelfLockVelY: last.Bullet.SelfLockVelY,
 
-			HitboxOffsetX: last.HitboxOffsetX,
+			HitboxOffsetX: last.Bullet.HitboxOffsetX,
-			HitboxOffsetY: last.HitboxOffsetY,
+			HitboxOffsetY: last.Bullet.HitboxOffsetY,
-			HitboxSizeX:   last.HitboxSizeX,
+			HitboxSizeX:   last.Bullet.HitboxSizeX,
-			HitboxSizeY:   last.HitboxSizeY,
+			HitboxSizeY:   last.Bullet.HitboxSizeY,
 
-			BlowUp: last.BlowUp,
+			BlowUp: last.Bullet.BlowUp,
-			TeamId: last.TeamId,
+
+			SpeciesId:       last.Bullet.SpeciesId,
+			ExplosionFrames: last.Bullet.ExplosionFrames,
+
+			BlState:         last.BlState,
+			FramesInBlState: last.FramesInBlState,
 		}
 		ret.MeleeBullets[i] = pbBullet
 	}
 
 	for i, last := range rdf.FireballBullets {
 		pbBullet := &pb.FireballBullet{
-			BulletLocalId:           last.BulletLocalId,
+			BulletLocalId:           last.BattleAttr.BulletLocalId,
-			OriginatedRenderFrameId: last.OriginatedRenderFrameId,
+			OriginatedRenderFrameId: last.BattleAttr.OriginatedRenderFrameId,
-			OffenderJoinIndex:       last.OffenderJoinIndex,
+			OffenderJoinIndex:       last.BattleAttr.OffenderJoinIndex,
+			TeamId:                  last.BattleAttr.TeamId,
 
-			StartupFrames:      last.StartupFrames,
+			StartupFrames:      last.Bullet.StartupFrames,
-			CancellableStFrame: last.CancellableStFrame,
+			CancellableStFrame: last.Bullet.CancellableStFrame,
-			CancellableEdFrame: last.CancellableEdFrame,
+			CancellableEdFrame: last.Bullet.CancellableEdFrame,
-			ActiveFrames:       last.ActiveFrames,
+			ActiveFrames:       last.Bullet.ActiveFrames,
 
-			HitStunFrames:   last.HitStunFrames,
+			HitStunFrames:   last.Bullet.HitStunFrames,
-			BlockStunFrames: last.BlockStunFrames,
+			BlockStunFrames: last.Bullet.BlockStunFrames,
-			PushbackVelX:    last.PushbackVelX,
+			PushbackVelX:    last.Bullet.PushbackVelX,
-			PushbackVelY:    last.PushbackVelY,
+			PushbackVelY:    last.Bullet.PushbackVelY,
-			Damage:          last.Damage,
+			Damage:          last.Bullet.Damage,
 
-			SelfLockVelX: last.SelfLockVelX,
+			SelfLockVelX: last.Bullet.SelfLockVelX,
-			SelfLockVelY: last.SelfLockVelY,
+			SelfLockVelY: last.Bullet.SelfLockVelY,
 
-			HitboxOffsetX: last.HitboxOffsetX,
+			HitboxOffsetX: last.Bullet.HitboxOffsetX,
-			HitboxOffsetY: last.HitboxOffsetY,
+			HitboxOffsetY: last.Bullet.HitboxOffsetY,
-			HitboxSizeX:   last.HitboxSizeX,
+			HitboxSizeX:   last.Bullet.HitboxSizeX,
-			HitboxSizeY:   last.HitboxSizeY,
+			HitboxSizeY:   last.Bullet.HitboxSizeY,
 
-			BlowUp: last.BlowUp,
+			BlowUp: last.Bullet.BlowUp,
-			TeamId: last.TeamId,
+
+			SpeciesId:       last.Bullet.SpeciesId,
+			ExplosionFrames: last.Bullet.ExplosionFrames,
+
+			BlState:         last.BlState,
+			FramesInBlState: last.FramesInBlState,
 
 			VirtualGridX: last.VirtualGridX,
 			VirtualGridY: last.VirtualGridY,
@@ -147,6 +162,9 @@ func toPbPlayers(modelInstances map[int32]*Player, withMetaInfo bool) []*pb.Play
 			BattleState:       last.BattleState,
 			CharacterState:    last.CharacterState,
 			InAir:             last.InAir,
+			OnWall:            last.OnWall,
+			OnWallNormX:       last.OnWallNormX,
+			OnWallNormY:       last.OnWallNormY,
 			JoinIndex:         last.JoinIndex,
 			BulletTeamId:      last.BulletTeamId,
 			ChCollisionTeamId: last.ChCollisionTeamId,
@@ -195,6 +213,9 @@ func toJsPlayers(modelInstances map[int32]*Player) []*battle.PlayerDownsync {
 			MaxHp:             last.MaxHp,
 			ColliderRadius:    last.ColliderRadius,
 			InAir:             last.InAir,
+			OnWall:            last.OnWall,
+			OnWallNormX:       last.OnWallNormX,
+			OnWallNormY:       last.OnWallNormY,
 			Score:             last.Score,
 			Removed:           last.Removed,
 		}

battle_srv/models/room.go

@@ -335,7 +335,20 @@ func (pR *Room) playerDownsyncStr(player *battle.PlayerDownsync) string {
 	if player.InAir {
 		inAirInt = 1
 	}
-	s := fmt.Sprintf("{%d,%d,%d,%d,%d,%d,%d}", player.JoinIndex, player.VirtualGridX, player.VirtualGridY, player.VelX, player.VelY, player.FramesToRecover, inAirInt)
+	onWallInt := 0
+	if player.OnWall {
+		onWallInt = 1
+	}
+	s := fmt.Sprintf("{%d,%d,%d,%d,%d,%d,%d,%d}", player.JoinIndex, player.VirtualGridX, player.VirtualGridY, player.VelX, player.VelY, player.FramesToRecover, inAirInt, onWallInt)
+
+	return s
+}
+
+func (pR *Room) fireballDownsyncStr(fireball *battle.FireballBullet) string {
+	if nil == fireball {
+		return ""
+	}
+	s := fmt.Sprintf("{%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d}", fireball.BattleAttr.BulletLocalId, fireball.BattleAttr.OriginatedRenderFrameId, fireball.BattleAttr.OffenderJoinIndex, fireball.VirtualGridX, fireball.VirtualGridY, fireball.VelX, fireball.VelY, fireball.DirX, fireball.DirY, fireball.Bullet.HitboxSizeX, fireball.Bullet.HitboxSizeY)
 
 	return s
 }
@@ -365,7 +378,11 @@ func (pR *Room) rdfIdToActuallyUsedInputString() string {
 		for _, player := range rdf.PlayersArr {
 			playersStrBldr = append(playersStrBldr, pR.playerDownsyncStr(player))
 		}
-		s = append(s, fmt.Sprintf("rdfId:%d\nplayers:[%v]\nactuallyUsedinputList:{%v}", rdfId, strings.Join(playersStrBldr, ","), pR.inputFrameDownsyncStr(pR.rdfIdToActuallyUsedInput[rdfId])))
+		fireballsStrBldr := make([]string, 0, len(rdf.FireballBullets))
+		for _, fireball := range rdf.FireballBullets {
+			fireballsStrBldr = append(fireballsStrBldr, pR.fireballDownsyncStr(fireball))
+		}
+		s = append(s, fmt.Sprintf("rdfId:%d\nplayers:[%v]\nfireballs:[%v]\nactuallyUsedinputList:{%v}", rdfId, strings.Join(playersStrBldr, ","), strings.Join(fireballsStrBldr, ","), pR.inputFrameDownsyncStr(pR.rdfIdToActuallyUsedInput[rdfId])))
 	}
 
 	return strings.Join(s, "\n")
@@ -381,7 +398,7 @@ func (pR *Room) StartBattle() {
 
 	for _, player := range pR.Players {
 		speciesId := int(player.JoinIndex - 1) // FIXME: Hardcoded the values for now
-		if player.JoinIndex == 2 {
+		if player.JoinIndex == 1 {
 			speciesId = 4096
 		}
 		chosenCh := battle.Characters[speciesId]
@@ -1325,7 +1342,7 @@ func (pR *Room) doBattleMainLoopPerTickBackendDynamicsWithProperLocking(prevRend
 			snapshotStFrameId = refSnapshotStFrameId
 		}
 		inputsBufferSnapshot := pR.produceInputsBufferSnapshotWithCurDynamicsRenderFrameAsRef(unconfirmedMask, snapshotStFrameId, pR.LastAllConfirmedInputFrameId+1)
-		Logger.Debug(fmt.Sprintf("[forceConfirmation] roomId=%v, room.RenderFrameId=%v, room.CurDynamicsRenderFrameId=%v, room.LastAllConfirmedInputFrameId=%v, unconfirmedMask=%v", pR.Id, pR.RenderFrameId, pR.CurDynamicsRenderFrameId, pR.LastAllConfirmedInputFrameId, unconfirmedMask))
+		//Logger.Warn(fmt.Sprintf("[forceConfirmation] roomId=%v, room.RenderFrameId=%v, room.CurDynamicsRenderFrameId=%v, room.LastAllConfirmedInputFrameId=%v, unconfirmedMask=%v", pR.Id, pR.RenderFrameId, pR.CurDynamicsRenderFrameId, pR.LastAllConfirmedInputFrameId, unconfirmedMask))
 		pR.downsyncToAllPlayers(inputsBufferSnapshot)
 	}
 }
@@ -1440,8 +1457,8 @@ func (pR *Room) downsyncToSinglePlayer(playerId int32, player *Player, refRender
 		pbRefRenderFrame.SpeciesIdList = pR.SpeciesIdList
 		pR.sendSafely(pbRefRenderFrame, toSendInputFrameDownsyncsSnapshot, DOWNSYNC_MSG_ACT_FORCED_RESYNC, playerId, false)
 		//Logger.Warn(fmt.Sprintf("Sent refRenderFrameId=%v & inputFrameIds [%d, %d), for roomId=%v, playerId=%d, playerJoinIndex=%d, renderFrameId=%d, curDynamicsRenderFrameId=%d, playerLastSentInputFrameId=%d: InputsBuffer=%v", refRenderFrameId, toSendInputFrameIdSt, toSendInputFrameIdEd, pR.Id, playerId, player.JoinIndex, pR.RenderFrameId, pR.CurDynamicsRenderFrameId, player.LastSentInputFrameId, pR.InputsBufferString(false)))
-		if shouldResync1 {
+		if shouldResync1 || shouldResync3 {
-			Logger.Warn(fmt.Sprintf("Sent refRenderFrameId=%v & inputFrameIds [%d, %d), for roomId=%v, playerId=%d, playerJoinIndex=%d, renderFrameId=%d, curDynamicsRenderFrameId=%d, playerLastSentInputFrameId=%d: shouldResync1=%v, shouldResync2=%v, shouldResync3=%v, playerBattleState=%d", refRenderFrameId, toSendInputFrameIdSt, toSendInputFrameIdEd, pR.Id, playerId, player.JoinIndex, pR.RenderFrameId, pR.CurDynamicsRenderFrameId, player.LastSentInputFrameId, shouldResync1, shouldResync2, shouldResync3, playerBattleState))
+			Logger.Debug(fmt.Sprintf("Sent refRenderFrameId=%v & inputFrameIds [%d, %d), for roomId=%v, playerId=%d, playerJoinIndex=%d, renderFrameId=%d, curDynamicsRenderFrameId=%d, playerLastSentInputFrameId=%d: shouldResync1=%v, shouldResync2=%v, shouldResync3=%v, playerBattleState=%d", refRenderFrameId, toSendInputFrameIdSt, toSendInputFrameIdEd, pR.Id, playerId, player.JoinIndex, pR.RenderFrameId, pR.CurDynamicsRenderFrameId, player.LastSentInputFrameId, shouldResync1, shouldResync2, shouldResync3, playerBattleState))
 		}
 	} else {
 		pR.sendSafely(nil, toSendInputFrameDownsyncsSnapshot, DOWNSYNC_MSG_ACT_INPUT_BATCH, playerId, false)

battle_srv/protos/room_downsync_frame.pb.go

@@ -51,6 +51,9 @@ type PlayerDownsync struct {
 	FramesInvinsible  int32  `protobuf:"varint,23,opt,name=framesInvinsible,proto3" json:"framesInvinsible,omitempty"`
 	BulletTeamId      int32  `protobuf:"varint,24,opt,name=bulletTeamId,proto3" json:"bulletTeamId,omitempty"`
 	ChCollisionTeamId int32  `protobuf:"varint,25,opt,name=chCollisionTeamId,proto3" json:"chCollisionTeamId,omitempty"`
+	OnWall            bool   `protobuf:"varint,26,opt,name=onWall,proto3" json:"onWall,omitempty"` // like "inAir", it’s by design a standalone field only inferred by the collision result of "applyInputFrameDownsyncDynamicsOnSingleRenderFrame" instead of "characterState", because we need check the transition for "characterState" from this field, i.e. "onWall (prev -> curr)"
+	OnWallNormX       int32  `protobuf:"varint,27,opt,name=onWallNormX,proto3" json:"onWallNormX,omitempty"`
+	OnWallNormY       int32  `protobuf:"varint,28,opt,name=onWallNormY,proto3" json:"onWallNormY,omitempty"`
 	Name              string `protobuf:"bytes,997,opt,name=name,proto3" json:"name,omitempty"`
 	DisplayName       string `protobuf:"bytes,998,opt,name=displayName,proto3" json:"displayName,omitempty"`
 	Avatar            string `protobuf:"bytes,999,opt,name=avatar,proto3" json:"avatar,omitempty"`
@@ -263,6 +266,27 @@ func (x *PlayerDownsync) GetChCollisionTeamId() int32 {
 	return 0
 }
 
+func (x *PlayerDownsync) GetOnWall() bool {
+	if x != nil {
+		return x.OnWall
+	}
+	return false
+}
+
+func (x *PlayerDownsync) GetOnWallNormX() int32 {
+	if x != nil {
+		return x.OnWallNormX
+	}
+	return 0
+}
+
+func (x *PlayerDownsync) GetOnWallNormY() int32 {
+	if x != nil {
+		return x.OnWallNormY
+	}
+	return 0
+}
+
 func (x *PlayerDownsync) GetName() string {
 	if x != nil {
 		return x.Name
@@ -807,6 +831,10 @@ type MeleeBullet struct {
 	BlowUp                  bool  `protobuf:"varint,18,opt,name=blowUp,proto3" json:"blowUp,omitempty"`
 	TeamId                  int32 `protobuf:"varint,19,opt,name=teamId,proto3" json:"teamId,omitempty"`
 	BulletLocalId           int32 `protobuf:"varint,20,opt,name=bulletLocalId,proto3" json:"bulletLocalId,omitempty"`
+	SpeciesId               int32 `protobuf:"varint,21,opt,name=speciesId,proto3" json:"speciesId,omitempty"`
+	ExplosionFrames         int32 `protobuf:"varint,22,opt,name=explosionFrames,proto3" json:"explosionFrames,omitempty"`
+	BlState                 int32 `protobuf:"varint,23,opt,name=blState,proto3" json:"blState,omitempty"`
+	FramesInBlState         int32 `protobuf:"varint,24,opt,name=framesInBlState,proto3" json:"framesInBlState,omitempty"`
 }
 
 func (x *MeleeBullet) Reset() {
@@ -981,6 +1009,34 @@ func (x *MeleeBullet) GetBulletLocalId() int32 {
 	return 0
 }
 
+func (x *MeleeBullet) GetSpeciesId() int32 {
+	if x != nil {
+		return x.SpeciesId
+	}
+	return 0
+}
+
+func (x *MeleeBullet) GetExplosionFrames() int32 {
+	if x != nil {
+		return x.ExplosionFrames
+	}
+	return 0
+}
+
+func (x *MeleeBullet) GetBlState() int32 {
+	if x != nil {
+		return x.BlState
+	}
+	return 0
+}
+
+func (x *MeleeBullet) GetFramesInBlState() int32 {
+	if x != nil {
+		return x.FramesInBlState
+	}
+	return 0
+}
+
 type FireballBullet struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1006,6 +1062,10 @@ type FireballBullet struct {
 	BlowUp                  bool  `protobuf:"varint,18,opt,name=blowUp,proto3" json:"blowUp,omitempty"`
 	TeamId                  int32 `protobuf:"varint,19,opt,name=teamId,proto3" json:"teamId,omitempty"`
 	BulletLocalId           int32 `protobuf:"varint,20,opt,name=bulletLocalId,proto3" json:"bulletLocalId,omitempty"`
+	SpeciesId               int32 `protobuf:"varint,21,opt,name=speciesId,proto3" json:"speciesId,omitempty"`
+	ExplosionFrames         int32 `protobuf:"varint,22,opt,name=explosionFrames,proto3" json:"explosionFrames,omitempty"`
+	BlState                 int32 `protobuf:"varint,23,opt,name=blState,proto3" json:"blState,omitempty"`
+	FramesInBlState         int32 `protobuf:"varint,24,opt,name=framesInBlState,proto3" json:"framesInBlState,omitempty"`
 	VirtualGridX            int32 `protobuf:"varint,999,opt,name=virtualGridX,proto3" json:"virtualGridX,omitempty"`
 	VirtualGridY            int32 `protobuf:"varint,1000,opt,name=virtualGridY,proto3" json:"virtualGridY,omitempty"`
 	DirX                    int32 `protobuf:"varint,1001,opt,name=dirX,proto3" json:"dirX,omitempty"`
@@ -1187,6 +1247,34 @@ func (x *FireballBullet) GetBulletLocalId() int32 {
 	return 0
 }
 
+func (x *FireballBullet) GetSpeciesId() int32 {
+	if x != nil {
+		return x.SpeciesId
+	}
+	return 0
+}
+
+func (x *FireballBullet) GetExplosionFrames() int32 {
+	if x != nil {
+		return x.ExplosionFrames
+	}
+	return 0
+}
+
+func (x *FireballBullet) GetBlState() int32 {
+	if x != nil {
+		return x.BlState
+	}
+	return 0
+}
+
+func (x *FireballBullet) GetFramesInBlState() int32 {
+	if x != nil {
+		return x.FramesInBlState
+	}
+	return 0
+}
+
 func (x *FireballBullet) GetVirtualGridX() int32 {
 	if x != nil {
 		return x.VirtualGridX
@@ -1504,7 +1592,7 @@ var file_room_downsync_frame_proto_rawDesc = []byte{
 	0x0a, 0x19, 0x72, 0x6f, 0x6f, 0x6d, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x5f,
 	0x66, 0x72, 0x61, 0x6d, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x73, 0x1a, 0x0e, 0x67, 0x65, 0x6f, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x22, 0xe9, 0x06, 0x0a, 0x0e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x6f,
+	0x6f, 0x74, 0x6f, 0x22, 0xc5, 0x07, 0x0a, 0x0e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x6f,
 	0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x76, 0x69, 0x72, 0x74, 0x75, 0x61,
 	0x6c, 0x47, 0x72, 0x69, 0x64, 0x58, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x76, 0x69,
@@ -1553,271 +1641,294 @@ var file_room_downsync_frame_proto_rawDesc = []byte{
 	0x28, 0x05, 0x52, 0x0c, 0x62, 0x75, 0x6c, 0x6c, 0x65, 0x74, 0x54, 0x65, 0x61, 0x6d, 0x49, 0x64,
 	0x12, 0x2c, 0x0a, 0x11, 0x63, 0x68, 0x43, 0x6f, 0x6c, 0x6c, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x54,
 	0x65, 0x61, 0x6d, 0x49, 0x64, 0x18, 0x19, 0x20, 0x01, 0x28, 0x05, 0x52, 0x11, 0x63, 0x68, 0x43,
-	0x6f, 0x6c, 0x6c, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x65, 0x61, 0x6d, 0x49, 0x64, 0x12, 0x13,
+	0x6f, 0x6c, 0x6c, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x65, 0x61, 0x6d, 0x49, 0x64, 0x12, 0x16,
-	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0xe5, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
+	0x0a, 0x06, 0x6f, 0x6e, 0x57, 0x61, 0x6c, 0x6c, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
-	0x61, 0x6d, 0x65, 0x12, 0x21, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61,
+	0x6f, 0x6e, 0x57, 0x61, 0x6c, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x6f, 0x6e, 0x57, 0x61, 0x6c, 0x6c,
-	0x6d, 0x65, 0x18, 0xe6, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c,
+	0x4e, 0x6f, 0x72, 0x6d, 0x58, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x6f, 0x6e, 0x57,
-	0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x17, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72,
+	0x61, 0x6c, 0x6c, 0x4e, 0x6f, 0x72, 0x6d, 0x58, 0x12, 0x20, 0x0a, 0x0b, 0x6f, 0x6e, 0x57, 0x61,
-	0x18, 0xe7, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x22,
+	0x6c, 0x6c, 0x4e, 0x6f, 0x72, 0x6d, 0x59, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x6f,
-	0x6f, 0x0a, 0x11, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x44, 0x65, 0x63,
+	0x6e, 0x57, 0x61, 0x6c, 0x6c, 0x4e, 0x6f, 0x72, 0x6d, 0x59, 0x12, 0x13, 0x0a, 0x04, 0x6e, 0x61,
-	0x6f, 0x64, 0x65, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x64, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x6d, 0x65, 0x18, 0xe5, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12,
-	0x52, 0x02, 0x64, 0x78, 0x12, 0x0e, 0x0a, 0x02, 0x64, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+	0x21, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0xe6,
-	0x52, 0x02, 0x64, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x62, 0x74, 0x6e, 0x41, 0x4c, 0x65, 0x76, 0x65,
+	0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61,
-	0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x62, 0x74, 0x6e, 0x41, 0x4c, 0x65, 0x76,
+	0x6d, 0x65, 0x12, 0x17, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0xe7, 0x07, 0x20,
-	0x65, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x62, 0x74, 0x6e, 0x42, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x18,
+	0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x22, 0x6f, 0x0a, 0x11, 0x49,
-	0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x62, 0x74, 0x6e, 0x42, 0x4c, 0x65, 0x76, 0x65, 0x6c,
+	0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x44, 0x65, 0x63, 0x6f, 0x64, 0x65, 0x64,
-	0x22, 0x50, 0x0a, 0x10, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x55, 0x70,
+	0x12, 0x0e, 0x0a, 0x02, 0x64, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x64, 0x78,
+	0x12, 0x0e, 0x0a, 0x02, 0x64, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x64, 0x79,
+	0x12, 0x1c, 0x0a, 0x09, 0x62, 0x74, 0x6e, 0x41, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x09, 0x62, 0x74, 0x6e, 0x41, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x1c,
+	0x0a, 0x09, 0x62, 0x74, 0x6e, 0x42, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x09, 0x62, 0x74, 0x6e, 0x42, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0x50, 0x0a, 0x10,
+	0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x55, 0x70, 0x73, 0x79, 0x6e, 0x63,
+	0x12, 0x22, 0x0a, 0x0c, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61,
+	0x6d, 0x65, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x65, 0x64, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x07, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x65, 0x64, 0x22, 0x7c,
+	0x0a, 0x12, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x44, 0x6f, 0x77, 0x6e,
 	0x73, 0x79, 0x6e, 0x63, 0x12, 0x22, 0x0a, 0x0c, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61,
 	0x6d, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x69, 0x6e, 0x70, 0x75,
-	0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x63, 0x6f,
+	0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x70, 0x75,
-	0x64, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x07, 0x65, 0x6e, 0x63, 0x6f, 0x64,
+	0x74, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x04, 0x52, 0x09, 0x69, 0x6e, 0x70,
-	0x65, 0x64, 0x22, 0x7c, 0x0a, 0x12, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65,
+	0x75, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x72,
-	0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x12, 0x22, 0x0a, 0x0c, 0x69, 0x6e, 0x70, 0x75,
+	0x6d, 0x65, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0d, 0x63,
-	0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c,
+	0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x65, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x3b, 0x0a, 0x0f,
-	0x69, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09,
+	0x48, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x55, 0x70, 0x73, 0x79, 0x6e, 0x63, 0x12,
-	0x69, 0x6e, 0x70, 0x75, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x04, 0x52,
+	0x28, 0x0a, 0x0f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
-	0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x63, 0x6f,
+	0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74,
-	0x6e, 0x66, 0x69, 0x72, 0x6d, 0x65, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0xb8, 0x02, 0x0a, 0x05, 0x57, 0x73,
-	0x04, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x65, 0x64, 0x4c, 0x69, 0x73, 0x74,
+	0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x73, 0x67, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x22, 0x3b, 0x0a, 0x0f, 0x48, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x55, 0x70, 0x73,
+	0x28, 0x05, 0x52, 0x05, 0x6d, 0x73, 0x67, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61,
-	0x79, 0x6e, 0x63, 0x12, 0x28, 0x0a, 0x0f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x69, 0x6d,
+	0x79, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x6c, 0x61,
-	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x63, 0x6c,
+	0x79, 0x65, 0x72, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x63, 0x74, 0x18, 0x03, 0x20, 0x01,
-	0x69, 0x65, 0x6e, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0xb8, 0x02,
+	0x28, 0x05, 0x52, 0x03, 0x61, 0x63, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x6a, 0x6f, 0x69, 0x6e, 0x49,
-	0x0a, 0x05, 0x57, 0x73, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x73, 0x67, 0x49, 0x64,
+	0x6e, 0x64, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6a, 0x6f, 0x69, 0x6e,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6d, 0x73, 0x67, 0x49, 0x64, 0x12, 0x1a, 0x0a,
+	0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x46,
-	0x08, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x61, 0x63,
-	0x08, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x63, 0x74,
+	0x6b, 0x69, 0x6e, 0x67, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x12, 0x61,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x61, 0x63, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x6a,
+	0x63, 0x6b, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49,
-	0x6f, 0x69, 0x6e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09,
+	0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x49,
-	0x6a, 0x6f, 0x69, 0x6e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x63, 0x6b,
+	0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x4e, 0x0a, 0x15, 0x69,
-	0x69, 0x6e, 0x67, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05,
+	0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x55, 0x70, 0x73, 0x79, 0x6e, 0x63, 0x42,
-	0x52, 0x0d, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12,
+	0x61, 0x74, 0x63, 0x68, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x70, 0x72, 0x6f,
-	0x2e, 0x0a, 0x12, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72,
+	0x74, 0x6f, 0x73, 0x2e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x55, 0x70,
-	0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x61, 0x63, 0x6b,
+	0x73, 0x79, 0x6e, 0x63, 0x52, 0x15, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65,
-	0x69, 0x6e, 0x67, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12,
+	0x55, 0x70, 0x73, 0x79, 0x6e, 0x63, 0x42, 0x61, 0x74, 0x63, 0x68, 0x12, 0x27, 0x0a, 0x02, 0x68,
-	0x4e, 0x0a, 0x15, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x55, 0x70, 0x73,
+	0x62, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73,
-	0x79, 0x6e, 0x63, 0x42, 0x61, 0x74, 0x63, 0x68, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18,
+	0x2e, 0x48, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x55, 0x70, 0x73, 0x79, 0x6e, 0x63,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61,
+	0x52, 0x02, 0x68, 0x62, 0x22, 0x89, 0x02, 0x0a, 0x06, 0x57, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x6d, 0x65, 0x55, 0x70, 0x73, 0x79, 0x6e, 0x63, 0x52, 0x15, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46,
+	0x10, 0x0a, 0x03, 0x72, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x65,
-	0x72, 0x61, 0x6d, 0x65, 0x55, 0x70, 0x73, 0x79, 0x6e, 0x63, 0x42, 0x61, 0x74, 0x63, 0x68, 0x12,
+	0x74, 0x12, 0x20, 0x0a, 0x0b, 0x65, 0x63, 0x68, 0x6f, 0x65, 0x64, 0x4d, 0x73, 0x67, 0x49, 0x64,
-	0x27, 0x0a, 0x02, 0x68, 0x62, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x70, 0x72,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x65, 0x63, 0x68, 0x6f, 0x65, 0x64, 0x4d, 0x73,
-	0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x48, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x55, 0x70,
+	0x67, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x63, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
-	0x73, 0x79, 0x6e, 0x63, 0x52, 0x02, 0x68, 0x62, 0x22, 0x89, 0x02, 0x0a, 0x06, 0x57, 0x73, 0x52,
+	0x52, 0x03, 0x61, 0x63, 0x74, 0x12, 0x2b, 0x0a, 0x03, 0x72, 0x64, 0x66, 0x18, 0x04, 0x20, 0x01,
-	0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x28, 0x0b, 0x32, 0x19, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x52, 0x6f, 0x6f, 0x6d,
-	0x52, 0x03, 0x72, 0x65, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x65, 0x63, 0x68, 0x6f, 0x65, 0x64, 0x4d,
+	0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x52, 0x03, 0x72,
-	0x73, 0x67, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x65, 0x63, 0x68, 0x6f,
+	0x64, 0x66, 0x12, 0x54, 0x0a, 0x17, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65,
-	0x65, 0x64, 0x4d, 0x73, 0x67, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x63, 0x74, 0x18, 0x03,
+	0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x42, 0x61, 0x74, 0x63, 0x68, 0x18, 0x05, 0x20,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x61, 0x63, 0x74, 0x12, 0x2b, 0x0a, 0x03, 0x72, 0x64, 0x66,
+	0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x49, 0x6e, 0x70,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e,
+	0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x52,
-	0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x46, 0x72, 0x61, 0x6d,
+	0x17, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x44, 0x6f, 0x77, 0x6e, 0x73,
-	0x65, 0x52, 0x03, 0x72, 0x64, 0x66, 0x12, 0x54, 0x0a, 0x17, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46,
+	0x79, 0x6e, 0x63, 0x42, 0x61, 0x74, 0x63, 0x68, 0x12, 0x36, 0x0a, 0x08, 0x62, 0x63, 0x69, 0x46,
-	0x72, 0x61, 0x6d, 0x65, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x42, 0x61, 0x74, 0x63,
+	0x72, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x70, 0x72, 0x6f,
-	0x68, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73,
+	0x74, 0x6f, 0x73, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6c, 0x6c, 0x69, 0x64,
-	0x2e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x44, 0x6f, 0x77, 0x6e, 0x73,
+	0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x62, 0x63, 0x69, 0x46, 0x72, 0x61, 0x6d, 0x65,
-	0x79, 0x6e, 0x63, 0x52, 0x17, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x44,
+	0x22, 0xf4, 0x01, 0x0a, 0x14, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x73, 0x42, 0x75, 0x66, 0x66, 0x65,
-	0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x42, 0x61, 0x74, 0x63, 0x68, 0x12, 0x36, 0x0a, 0x08,
+	0x72, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x12, 0x2a, 0x0a, 0x10, 0x72, 0x65, 0x66,
-	0x62, 0x63, 0x69, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,
+	0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f,
+	0x01, 0x28, 0x05, 0x52, 0x10, 0x72, 0x65, 0x66, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x46, 0x72,
-	0x6c, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x62, 0x63, 0x69, 0x46,
+	0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x0f, 0x75, 0x6e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x72, 0x61, 0x6d, 0x65, 0x22, 0xf4, 0x01, 0x0a, 0x14, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x73, 0x42,
+	0x72, 0x6d, 0x65, 0x64, 0x4d, 0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0f,
-	0x75, 0x66, 0x66, 0x65, 0x72, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x12, 0x2a, 0x0a,
+	0x75, 0x6e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x65, 0x64, 0x4d, 0x61, 0x73, 0x6b, 0x12,
-	0x10, 0x72, 0x65, 0x66, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49,
+	0x58, 0x0a, 0x19, 0x74, 0x6f, 0x53, 0x65, 0x6e, 0x64, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x10, 0x72, 0x65, 0x66, 0x52, 0x65, 0x6e, 0x64,
+	0x61, 0x6d, 0x65, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x73, 0x18, 0x03, 0x20, 0x03,
-	0x65, 0x72, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x0f, 0x75, 0x6e, 0x63,
+	0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x49, 0x6e, 0x70, 0x75,
-	0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x65, 0x64, 0x4d, 0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x01,
+	0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x52, 0x19,
-	0x28, 0x04, 0x52, 0x0f, 0x75, 0x6e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x65, 0x64, 0x4d,
+	0x74, 0x6f, 0x53, 0x65, 0x6e, 0x64, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65,
-	0x61, 0x73, 0x6b, 0x12, 0x58, 0x0a, 0x19, 0x74, 0x6f, 0x53, 0x65, 0x6e, 0x64, 0x49, 0x6e, 0x70,
+	0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x73, 0x12, 0x2c, 0x0a, 0x11, 0x73, 0x68, 0x6f,
-	0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x73,
+	0x75, 0x6c, 0x64, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x52, 0x65, 0x73, 0x79, 0x6e, 0x63, 0x18, 0x04,
-	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x46, 0x6f, 0x72, 0x63,
-	0x49, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79,
+	0x65, 0x52, 0x65, 0x73, 0x79, 0x6e, 0x63, 0x22, 0x89, 0x07, 0x0a, 0x0b, 0x4d, 0x65, 0x6c, 0x65,
-	0x6e, 0x63, 0x52, 0x19, 0x74, 0x6f, 0x53, 0x65, 0x6e, 0x64, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x46,
+	0x65, 0x42, 0x75, 0x6c, 0x6c, 0x65, 0x74, 0x12, 0x38, 0x0a, 0x17, 0x6f, 0x72, 0x69, 0x67, 0x69,
-	0x72, 0x61, 0x6d, 0x65, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63, 0x73, 0x12, 0x2c, 0x0a,
+	0x6e, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x46, 0x72, 0x61, 0x6d, 0x65,
-	0x11, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x52, 0x65, 0x73, 0x79,
+	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x17, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e,
-	0x6e, 0x63, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64,
+	0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49,
-	0x46, 0x6f, 0x72, 0x63, 0x65, 0x52, 0x65, 0x73, 0x79, 0x6e, 0x63, 0x22, 0xfd, 0x05, 0x0a, 0x0b,
+	0x64, 0x12, 0x2c, 0x0a, 0x11, 0x6f, 0x66, 0x66, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x4a, 0x6f, 0x69,
-	0x4d, 0x65, 0x6c, 0x65, 0x65, 0x42, 0x75, 0x6c, 0x6c, 0x65, 0x74, 0x12, 0x38, 0x0a, 0x17, 0x6f,
+	0x6e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x11, 0x6f, 0x66,
-	0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x46,
+	0x66, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x4a, 0x6f, 0x69, 0x6e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12,
-	0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x17, 0x6f, 0x72,
+	0x24, 0x0a, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x75, 0x70, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73,
-	0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x46, 0x72,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x75, 0x70, 0x46,
-	0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x2c, 0x0a, 0x11, 0x6f, 0x66, 0x66, 0x65, 0x6e, 0x64, 0x65,
+	0x72, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x2e, 0x0a, 0x12, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x6c,
-	0x72, 0x4a, 0x6f, 0x69, 0x6e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+	0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x52, 0x11, 0x6f, 0x66, 0x66, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x4a, 0x6f, 0x69, 0x6e, 0x49, 0x6e,
+	0x05, 0x52, 0x12, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74,
-	0x64, 0x65, 0x78, 0x12, 0x24, 0x0a, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x75, 0x70, 0x46, 0x72,
+	0x46, 0x72, 0x61, 0x6d, 0x65, 0x12, 0x2e, 0x0a, 0x12, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x6c,
-	0x61, 0x6d, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72,
+	0x61, 0x62, 0x6c, 0x65, 0x45, 0x64, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x74, 0x75, 0x70, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x2e, 0x0a, 0x12, 0x63, 0x61, 0x6e,
+	0x05, 0x52, 0x12, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x64,
-	0x63, 0x65, 0x6c, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x18,
+	0x46, 0x72, 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x46,
-	0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x6c, 0x61, 0x62,
+	0x72, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x61, 0x63, 0x74,
-	0x6c, 0x65, 0x53, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x12, 0x2e, 0x0a, 0x12, 0x63, 0x61, 0x6e,
+	0x69, 0x76, 0x65, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x24, 0x0a, 0x0d, 0x68, 0x69, 0x74,
-	0x63, 0x65, 0x6c, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x64, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x18,
+	0x53, 0x74, 0x75, 0x6e, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05,
-	0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x6c, 0x61, 0x62,
+	0x52, 0x0d, 0x68, 0x69, 0x74, 0x53, 0x74, 0x75, 0x6e, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x12,
-	0x6c, 0x65, 0x45, 0x64, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x63, 0x74,
+	0x28, 0x0a, 0x0f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x53, 0x74, 0x75, 0x6e, 0x46, 0x72, 0x61, 0x6d,
-	0x69, 0x76, 0x65, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x65, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x53,
-	0x0c, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x24, 0x0a,
+	0x74, 0x75, 0x6e, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x75, 0x73,
-	0x0d, 0x68, 0x69, 0x74, 0x53, 0x74, 0x75, 0x6e, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x07,
+	0x68, 0x62, 0x61, 0x63, 0x6b, 0x56, 0x65, 0x6c, 0x58, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x68, 0x69, 0x74, 0x53, 0x74, 0x75, 0x6e, 0x46, 0x72, 0x61,
+	0x0c, 0x70, 0x75, 0x73, 0x68, 0x62, 0x61, 0x63, 0x6b, 0x56, 0x65, 0x6c, 0x58, 0x12, 0x22, 0x0a,
-	0x6d, 0x65, 0x73, 0x12, 0x28, 0x0a, 0x0f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x53, 0x74, 0x75, 0x6e,
+	0x0c, 0x70, 0x75, 0x73, 0x68, 0x62, 0x61, 0x63, 0x6b, 0x56, 0x65, 0x6c, 0x59, 0x18, 0x0a, 0x20,
-	0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x62, 0x6c,
-	0x6f, 0x63, 0x6b, 0x53, 0x74, 0x75, 0x6e, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x22, 0x0a,
-	0x0c, 0x70, 0x75, 0x73, 0x68, 0x62, 0x61, 0x63, 0x6b, 0x56, 0x65, 0x6c, 0x58, 0x18, 0x09, 0x20,
 	0x01, 0x28, 0x05, 0x52, 0x0c, 0x70, 0x75, 0x73, 0x68, 0x62, 0x61, 0x63, 0x6b, 0x56, 0x65, 0x6c,
-	0x58, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x75, 0x73, 0x68, 0x62, 0x61, 0x63, 0x6b, 0x56, 0x65, 0x6c,
+	0x59, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x61, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28,
-	0x59, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x70, 0x75, 0x73, 0x68, 0x62, 0x61, 0x63,
+	0x05, 0x52, 0x06, 0x64, 0x61, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x65, 0x6c,
-	0x6b, 0x56, 0x65, 0x6c, 0x59, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x61, 0x6d, 0x61, 0x67, 0x65, 0x18,
+	0x66, 0x4c, 0x6f, 0x63, 0x6b, 0x56, 0x65, 0x6c, 0x58, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x64, 0x61, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x22, 0x0a,
+	0x0c, 0x73, 0x65, 0x6c, 0x66, 0x4c, 0x6f, 0x63, 0x6b, 0x56, 0x65, 0x6c, 0x58, 0x12, 0x22, 0x0a,
-	0x0c, 0x73, 0x65, 0x6c, 0x66, 0x4c, 0x6f, 0x63, 0x6b, 0x56, 0x65, 0x6c, 0x58, 0x18, 0x0c, 0x20,
+	0x0c, 0x73, 0x65, 0x6c, 0x66, 0x4c, 0x6f, 0x63, 0x6b, 0x56, 0x65, 0x6c, 0x59, 0x18, 0x0d, 0x20,
 	0x01, 0x28, 0x05, 0x52, 0x0c, 0x73, 0x65, 0x6c, 0x66, 0x4c, 0x6f, 0x63, 0x6b, 0x56, 0x65, 0x6c,
-	0x58, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x65, 0x6c, 0x66, 0x4c, 0x6f, 0x63, 0x6b, 0x56, 0x65, 0x6c,
+	0x59, 0x12, 0x24, 0x0a, 0x0d, 0x68, 0x69, 0x74, 0x62, 0x6f, 0x78, 0x4f, 0x66, 0x66, 0x73, 0x65,
-	0x59, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x73, 0x65, 0x6c, 0x66, 0x4c, 0x6f, 0x63,
+	0x74, 0x58, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x68, 0x69, 0x74, 0x62, 0x6f, 0x78,
-	0x6b, 0x56, 0x65, 0x6c, 0x59, 0x12, 0x24, 0x0a, 0x0d, 0x68, 0x69, 0x74, 0x62, 0x6f, 0x78, 0x4f,
+	0x4f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x58, 0x12, 0x24, 0x0a, 0x0d, 0x68, 0x69, 0x74, 0x62, 0x6f,
-	0x66, 0x66, 0x73, 0x65, 0x74, 0x58, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x68, 0x69,
+	0x78, 0x4f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x59, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d,
-	0x74, 0x62, 0x6f, 0x78, 0x4f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x58, 0x12, 0x24, 0x0a, 0x0d, 0x68,
+	0x68, 0x69, 0x74, 0x62, 0x6f, 0x78, 0x4f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x59, 0x12, 0x20, 0x0a,
-	0x69, 0x74, 0x62, 0x6f, 0x78, 0x4f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x59, 0x18, 0x0f, 0x20, 0x01,
+	0x0b, 0x68, 0x69, 0x74, 0x62, 0x6f, 0x78, 0x53, 0x69, 0x7a, 0x65, 0x58, 0x18, 0x10, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x0d, 0x68, 0x69, 0x74, 0x62, 0x6f, 0x78, 0x4f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x28, 0x05, 0x52, 0x0b, 0x68, 0x69, 0x74, 0x62, 0x6f, 0x78, 0x53, 0x69, 0x7a, 0x65, 0x58, 0x12,
-	0x59, 0x12, 0x20, 0x0a, 0x0b, 0x68, 0x69, 0x74, 0x62, 0x6f, 0x78, 0x53, 0x69, 0x7a, 0x65, 0x58,
+	0x20, 0x0a, 0x0b, 0x68, 0x69, 0x74, 0x62, 0x6f, 0x78, 0x53, 0x69, 0x7a, 0x65, 0x59, 0x18, 0x11,
-	0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x68, 0x69, 0x74, 0x62, 0x6f, 0x78, 0x53, 0x69,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x68, 0x69, 0x74, 0x62, 0x6f, 0x78, 0x53, 0x69, 0x7a, 0x65,
-	0x7a, 0x65, 0x58, 0x12, 0x20, 0x0a, 0x0b, 0x68, 0x69, 0x74, 0x62, 0x6f, 0x78, 0x53, 0x69, 0x7a,
+	0x59, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6c, 0x6f, 0x77, 0x55, 0x70, 0x18, 0x12, 0x20, 0x01, 0x28,
-	0x65, 0x59, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x68, 0x69, 0x74, 0x62, 0x6f, 0x78,
+	0x08, 0x52, 0x06, 0x62, 0x6c, 0x6f, 0x77, 0x55, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x61,
-	0x53, 0x69, 0x7a, 0x65, 0x59, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6c, 0x6f, 0x77, 0x55, 0x70, 0x18,
+	0x6d, 0x49, 0x64, 0x18, 0x13, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x61, 0x6d, 0x49,
-	0x12, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x62, 0x6c, 0x6f, 0x77, 0x55, 0x70, 0x12, 0x16, 0x0a,
+	0x64, 0x12, 0x24, 0x0a, 0x0d, 0x62, 0x75, 0x6c, 0x6c, 0x65, 0x74, 0x4c, 0x6f, 0x63, 0x61, 0x6c,
-	0x06, 0x74, 0x65, 0x61, 0x6d, 0x49, 0x64, 0x18, 0x13, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74,
+	0x49, 0x64, 0x18, 0x14, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x62, 0x75, 0x6c, 0x6c, 0x65, 0x74,
-	0x65, 0x61, 0x6d, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x62, 0x75, 0x6c, 0x6c, 0x65, 0x74, 0x4c,
+	0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x70, 0x65, 0x63, 0x69,
-	0x6f, 0x63, 0x61, 0x6c, 0x49, 0x64, 0x18, 0x14, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x62, 0x75,
+	0x65, 0x73, 0x49, 0x64, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x73, 0x70, 0x65, 0x63,
-	0x6c, 0x6c, 0x65, 0x74, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x49, 0x64, 0x22, 0xb5, 0x07, 0x0a, 0x0e,
+	0x69, 0x65, 0x73, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x0f, 0x65, 0x78, 0x70, 0x6c, 0x6f, 0x73, 0x69,
-	0x46, 0x69, 0x72, 0x65, 0x62, 0x61, 0x6c, 0x6c, 0x42, 0x75, 0x6c, 0x6c, 0x65, 0x74, 0x12, 0x38,
+	0x6f, 0x6e, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x16, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f,
-	0x0a, 0x17, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x6e, 0x64,
+	0x65, 0x78, 0x70, 0x6c, 0x6f, 0x73, 0x69, 0x6f, 0x6e, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x12,
-	0x65, 0x72, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x18, 0x0a, 0x07, 0x62, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x17, 0x20, 0x01, 0x28, 0x05,
-	0x17, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x6e, 0x64, 0x65,
+	0x52, 0x07, 0x62, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x66, 0x72, 0x61,
-	0x72, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x2c, 0x0a, 0x11, 0x6f, 0x66, 0x66, 0x65,
+	0x6d, 0x65, 0x73, 0x49, 0x6e, 0x42, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x18, 0x20, 0x01,
-	0x6e, 0x64, 0x65, 0x72, 0x4a, 0x6f, 0x69, 0x6e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20,
+	0x28, 0x05, 0x52, 0x0f, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x49, 0x6e, 0x42, 0x6c, 0x53, 0x74,
-	0x01, 0x28, 0x05, 0x52, 0x11, 0x6f, 0x66, 0x66, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x4a, 0x6f, 0x69,
+	0x61, 0x74, 0x65, 0x22, 0xc1, 0x08, 0x0a, 0x0e, 0x46, 0x69, 0x72, 0x65, 0x62, 0x61, 0x6c, 0x6c,
-	0x6e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x24, 0x0a, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x75,
+	0x42, 0x75, 0x6c, 0x6c, 0x65, 0x74, 0x12, 0x38, 0x0a, 0x17, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e,
-	0x70, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x73,
+	0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49,
-	0x74, 0x61, 0x72, 0x74, 0x75, 0x70, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x2e, 0x0a, 0x12,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x17, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61,
-	0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x46, 0x72, 0x61,
+	0x74, 0x65, 0x64, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x49, 0x64,
-	0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c,
+	0x12, 0x2c, 0x0a, 0x11, 0x6f, 0x66, 0x66, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x4a, 0x6f, 0x69, 0x6e,
-	0x6c, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x12, 0x2e, 0x0a, 0x12,
+	0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x11, 0x6f, 0x66, 0x66,
-	0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x64, 0x46, 0x72, 0x61,
+	0x65, 0x6e, 0x64, 0x65, 0x72, 0x4a, 0x6f, 0x69, 0x6e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x24,
-	0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c,
+	0x0a, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x75, 0x70, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x18,
-	0x6c, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x64, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c,
+	0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x75, 0x70, 0x46, 0x72,
-	0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x06, 0x20, 0x01,
+	0x61, 0x6d, 0x65, 0x73, 0x12, 0x2e, 0x0a, 0x12, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x6c, 0x61,
-	0x28, 0x05, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73,
+	0x62, 0x6c, 0x65, 0x53, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
-	0x12, 0x24, 0x0a, 0x0d, 0x68, 0x69, 0x74, 0x53, 0x74, 0x75, 0x6e, 0x46, 0x72, 0x61, 0x6d, 0x65,
+	0x52, 0x12, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x46,
-	0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x68, 0x69, 0x74, 0x53, 0x74, 0x75, 0x6e,
+	0x72, 0x61, 0x6d, 0x65, 0x12, 0x2e, 0x0a, 0x12, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x6c, 0x61,
-	0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x28, 0x0a, 0x0f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x53,
+	0x62, 0x6c, 0x65, 0x45, 0x64, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05,
-	0x74, 0x75, 0x6e, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x52, 0x12, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x64, 0x46,
-	0x0f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x53, 0x74, 0x75, 0x6e, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73,
+	0x72, 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x46, 0x72,
-	0x12, 0x22, 0x0a, 0x0c, 0x70, 0x75, 0x73, 0x68, 0x62, 0x61, 0x63, 0x6b, 0x56, 0x65, 0x6c, 0x58,
+	0x61, 0x6d, 0x65, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x61, 0x63, 0x74, 0x69,
-	0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x70, 0x75, 0x73, 0x68, 0x62, 0x61, 0x63, 0x6b,
+	0x76, 0x65, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x24, 0x0a, 0x0d, 0x68, 0x69, 0x74, 0x53,
-	0x56, 0x65, 0x6c, 0x58, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x75, 0x73, 0x68, 0x62, 0x61, 0x63, 0x6b,
+	0x74, 0x75, 0x6e, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x56, 0x65, 0x6c, 0x59, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x70, 0x75, 0x73, 0x68,
+	0x0d, 0x68, 0x69, 0x74, 0x53, 0x74, 0x75, 0x6e, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x28,
-	0x62, 0x61, 0x63, 0x6b, 0x56, 0x65, 0x6c, 0x59, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x61, 0x6d, 0x61,
+	0x0a, 0x0f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x53, 0x74, 0x75, 0x6e, 0x46, 0x72, 0x61, 0x6d, 0x65,
-	0x67, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x64, 0x61, 0x6d, 0x61, 0x67, 0x65,
+	0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x53, 0x74,
-	0x12, 0x22, 0x0a, 0x0c, 0x73, 0x65, 0x6c, 0x66, 0x4c, 0x6f, 0x63, 0x6b, 0x56, 0x65, 0x6c, 0x58,
+	0x75, 0x6e, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x75, 0x73, 0x68,
-	0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x73, 0x65, 0x6c, 0x66, 0x4c, 0x6f, 0x63, 0x6b,
+	0x62, 0x61, 0x63, 0x6b, 0x56, 0x65, 0x6c, 0x58, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c,
-	0x56, 0x65, 0x6c, 0x58, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x65, 0x6c, 0x66, 0x4c, 0x6f, 0x63, 0x6b,
+	0x70, 0x75, 0x73, 0x68, 0x62, 0x61, 0x63, 0x6b, 0x56, 0x65, 0x6c, 0x58, 0x12, 0x22, 0x0a, 0x0c,
-	0x56, 0x65, 0x6c, 0x59, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x73, 0x65, 0x6c, 0x66,
+	0x70, 0x75, 0x73, 0x68, 0x62, 0x61, 0x63, 0x6b, 0x56, 0x65, 0x6c, 0x59, 0x18, 0x0a, 0x20, 0x01,
-	0x4c, 0x6f, 0x63, 0x6b, 0x56, 0x65, 0x6c, 0x59, 0x12, 0x24, 0x0a, 0x0d, 0x68, 0x69, 0x74, 0x62,
+	0x28, 0x05, 0x52, 0x0c, 0x70, 0x75, 0x73, 0x68, 0x62, 0x61, 0x63, 0x6b, 0x56, 0x65, 0x6c, 0x59,
-	0x6f, 0x78, 0x4f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x58, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x12, 0x16, 0x0a, 0x06, 0x64, 0x61, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05,
-	0x0d, 0x68, 0x69, 0x74, 0x62, 0x6f, 0x78, 0x4f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x58, 0x12, 0x24,
+	0x52, 0x06, 0x64, 0x61, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x65, 0x6c, 0x66,
-	0x0a, 0x0d, 0x68, 0x69, 0x74, 0x62, 0x6f, 0x78, 0x4f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x59, 0x18,
+	0x4c, 0x6f, 0x63, 0x6b, 0x56, 0x65, 0x6c, 0x58, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c,
-	0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x68, 0x69, 0x74, 0x62, 0x6f, 0x78, 0x4f, 0x66, 0x66,
+	0x73, 0x65, 0x6c, 0x66, 0x4c, 0x6f, 0x63, 0x6b, 0x56, 0x65, 0x6c, 0x58, 0x12, 0x22, 0x0a, 0x0c,
-	0x73, 0x65, 0x74, 0x59, 0x12, 0x20, 0x0a, 0x0b, 0x68, 0x69, 0x74, 0x62, 0x6f, 0x78, 0x53, 0x69,
+	0x73, 0x65, 0x6c, 0x66, 0x4c, 0x6f, 0x63, 0x6b, 0x56, 0x65, 0x6c, 0x59, 0x18, 0x0d, 0x20, 0x01,
-	0x7a, 0x65, 0x58, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x68, 0x69, 0x74, 0x62, 0x6f,
+	0x28, 0x05, 0x52, 0x0c, 0x73, 0x65, 0x6c, 0x66, 0x4c, 0x6f, 0x63, 0x6b, 0x56, 0x65, 0x6c, 0x59,
-	0x78, 0x53, 0x69, 0x7a, 0x65, 0x58, 0x12, 0x20, 0x0a, 0x0b, 0x68, 0x69, 0x74, 0x62, 0x6f, 0x78,
+	0x12, 0x24, 0x0a, 0x0d, 0x68, 0x69, 0x74, 0x62, 0x6f, 0x78, 0x4f, 0x66, 0x66, 0x73, 0x65, 0x74,
-	0x53, 0x69, 0x7a, 0x65, 0x59, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x68, 0x69, 0x74,
+	0x58, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x68, 0x69, 0x74, 0x62, 0x6f, 0x78, 0x4f,
-	0x62, 0x6f, 0x78, 0x53, 0x69, 0x7a, 0x65, 0x59, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6c, 0x6f, 0x77,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x58, 0x12, 0x24, 0x0a, 0x0d, 0x68, 0x69, 0x74, 0x62, 0x6f, 0x78,
-	0x55, 0x70, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x62, 0x6c, 0x6f, 0x77, 0x55, 0x70,
+	0x4f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x59, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x68,
-	0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x61, 0x6d, 0x49, 0x64, 0x18, 0x13, 0x20, 0x01, 0x28, 0x05,
+	0x69, 0x74, 0x62, 0x6f, 0x78, 0x4f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x59, 0x12, 0x20, 0x0a, 0x0b,
-	0x52, 0x06, 0x74, 0x65, 0x61, 0x6d, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x62, 0x75, 0x6c, 0x6c,
+	0x68, 0x69, 0x74, 0x62, 0x6f, 0x78, 0x53, 0x69, 0x7a, 0x65, 0x58, 0x18, 0x10, 0x20, 0x01, 0x28,
-	0x65, 0x74, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x49, 0x64, 0x18, 0x14, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x05, 0x52, 0x0b, 0x68, 0x69, 0x74, 0x62, 0x6f, 0x78, 0x53, 0x69, 0x7a, 0x65, 0x58, 0x12, 0x20,
-	0x0d, 0x62, 0x75, 0x6c, 0x6c, 0x65, 0x74, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x49, 0x64, 0x12, 0x23,
+	0x0a, 0x0b, 0x68, 0x69, 0x74, 0x62, 0x6f, 0x78, 0x53, 0x69, 0x7a, 0x65, 0x59, 0x18, 0x11, 0x20,
-	0x0a, 0x0c, 0x76, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x47, 0x72, 0x69, 0x64, 0x58, 0x18, 0xe7,
+	0x01, 0x28, 0x05, 0x52, 0x0b, 0x68, 0x69, 0x74, 0x62, 0x6f, 0x78, 0x53, 0x69, 0x7a, 0x65, 0x59,
-	0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x76, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x47, 0x72,
+	0x12, 0x16, 0x0a, 0x06, 0x62, 0x6c, 0x6f, 0x77, 0x55, 0x70, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08,
-	0x69, 0x64, 0x58, 0x12, 0x23, 0x0a, 0x0c, 0x76, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x47, 0x72,
+	0x52, 0x06, 0x62, 0x6c, 0x6f, 0x77, 0x55, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x61, 0x6d,
-	0x69, 0x64, 0x59, 0x18, 0xe8, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x76, 0x69, 0x72, 0x74,
+	0x49, 0x64, 0x18, 0x13, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x61, 0x6d, 0x49, 0x64,
-	0x75, 0x61, 0x6c, 0x47, 0x72, 0x69, 0x64, 0x59, 0x12, 0x13, 0x0a, 0x04, 0x64, 0x69, 0x72, 0x58,
+	0x12, 0x24, 0x0a, 0x0d, 0x62, 0x75, 0x6c, 0x6c, 0x65, 0x74, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x49,
-	0x18, 0xe9, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x64, 0x69, 0x72, 0x58, 0x12, 0x13, 0x0a,
+	0x64, 0x18, 0x14, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x62, 0x75, 0x6c, 0x6c, 0x65, 0x74, 0x4c,
-	0x04, 0x64, 0x69, 0x72, 0x59, 0x18, 0xea, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x64, 0x69,
+	0x6f, 0x63, 0x61, 0x6c, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x70, 0x65, 0x63, 0x69, 0x65,
-	0x72, 0x59, 0x12, 0x13, 0x0a, 0x04, 0x76, 0x65, 0x6c, 0x58, 0x18, 0xeb, 0x07, 0x20, 0x01, 0x28,
+	0x73, 0x49, 0x64, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x73, 0x70, 0x65, 0x63, 0x69,
-	0x05, 0x52, 0x04, 0x76, 0x65, 0x6c, 0x58, 0x12, 0x13, 0x0a, 0x04, 0x76, 0x65, 0x6c, 0x59, 0x18,
+	0x65, 0x73, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x0f, 0x65, 0x78, 0x70, 0x6c, 0x6f, 0x73, 0x69, 0x6f,
-	0xec, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x76, 0x65, 0x6c, 0x59, 0x12, 0x15, 0x0a, 0x05,
+	0x6e, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x16, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x65,
-	0x73, 0x70, 0x65, 0x65, 0x64, 0x18, 0xed, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x70,
+	0x78, 0x70, 0x6c, 0x6f, 0x73, 0x69, 0x6f, 0x6e, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x18,
-	0x65, 0x65, 0x64, 0x22, 0xc9, 0x05, 0x0a, 0x12, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f,
+	0x0a, 0x07, 0x62, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x17, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x6c, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x74,
+	0x07, 0x62, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x66, 0x72, 0x61, 0x6d,
-	0x61, 0x67, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73,
+	0x65, 0x73, 0x49, 0x6e, 0x42, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x18, 0x20, 0x01, 0x28,
-	0x74, 0x61, 0x67, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x69, 0x6e, 0x74, 0x65,
+	0x05, 0x52, 0x0f, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x49, 0x6e, 0x42, 0x6c, 0x53, 0x74, 0x61,
-	0x72, 0x76, 0x61, 0x6c, 0x54, 0x6f, 0x50, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+	0x74, 0x65, 0x12, 0x23, 0x0a, 0x0c, 0x76, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x47, 0x72, 0x69,
-	0x52, 0x0e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x54, 0x6f, 0x50, 0x69, 0x6e, 0x67,
+	0x64, 0x58, 0x18, 0xe7, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x76, 0x69, 0x72, 0x74, 0x75,
-	0x12, 0x34, 0x0a, 0x15, 0x77, 0x69, 0x6c, 0x6c, 0x4b, 0x69, 0x63, 0x6b, 0x49, 0x66, 0x49, 0x6e,
+	0x61, 0x6c, 0x47, 0x72, 0x69, 0x64, 0x58, 0x12, 0x23, 0x0a, 0x0c, 0x76, 0x69, 0x72, 0x74, 0x75,
-	0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x46, 0x6f, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x61, 0x6c, 0x47, 0x72, 0x69, 0x64, 0x59, 0x18, 0xe8, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c,
-	0x15, 0x77, 0x69, 0x6c, 0x6c, 0x4b, 0x69, 0x63, 0x6b, 0x49, 0x66, 0x49, 0x6e, 0x61, 0x63, 0x74,
+	0x76, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x47, 0x72, 0x69, 0x64, 0x59, 0x12, 0x13, 0x0a, 0x04,
-	0x69, 0x76, 0x65, 0x46, 0x6f, 0x72, 0x12, 0x20, 0x0a, 0x0b, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x52,
+	0x64, 0x69, 0x72, 0x58, 0x18, 0xe9, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x64, 0x69, 0x72,
-	0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x62, 0x6f, 0x75,
+	0x58, 0x12, 0x13, 0x0a, 0x04, 0x64, 0x69, 0x72, 0x59, 0x18, 0xea, 0x07, 0x20, 0x01, 0x28, 0x05,
-	0x6e, 0x64, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x12, 0x30, 0x0a, 0x13, 0x62, 0x61, 0x74, 0x74,
+	0x52, 0x04, 0x64, 0x69, 0x72, 0x59, 0x12, 0x13, 0x0a, 0x04, 0x76, 0x65, 0x6c, 0x58, 0x18, 0xeb,
-	0x6c, 0x65, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6e, 0x6f, 0x73, 0x18,
+	0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x76, 0x65, 0x6c, 0x58, 0x12, 0x13, 0x0a, 0x04, 0x76,
-	0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x13, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x44, 0x75, 0x72,
+	0x65, 0x6c, 0x59, 0x18, 0xec, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x76, 0x65, 0x6c, 0x59,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6e, 0x6f, 0x73, 0x12, 0x46, 0x0a, 0x1e, 0x69, 0x6e,
+	0x12, 0x15, 0x0a, 0x05, 0x73, 0x70, 0x65, 0x65, 0x64, 0x18, 0xed, 0x07, 0x20, 0x01, 0x28, 0x05,
-	0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x55, 0x70, 0x73, 0x79, 0x6e, 0x63, 0x44, 0x65,
+	0x52, 0x05, 0x73, 0x70, 0x65, 0x65, 0x64, 0x22, 0xc9, 0x05, 0x0a, 0x12, 0x42, 0x61, 0x74, 0x74,
-	0x6c, 0x61, 0x79, 0x54, 0x6f, 0x6c, 0x65, 0x72, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x06, 0x20, 0x01,
+	0x6c, 0x65, 0x43, 0x6f, 0x6c, 0x6c, 0x69, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1c,
-	0x28, 0x05, 0x52, 0x1e, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x55, 0x70,
+	0x0a, 0x09, 0x73, 0x74, 0x61, 0x67, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x73, 0x79, 0x6e, 0x63, 0x44, 0x65, 0x6c, 0x61, 0x79, 0x54, 0x6f, 0x6c, 0x65, 0x72, 0x61, 0x6e,
+	0x09, 0x52, 0x09, 0x73, 0x74, 0x61, 0x67, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e,
-	0x63, 0x65, 0x12, 0x48, 0x0a, 0x1f, 0x6d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x73, 0x69, 0x6e, 0x67,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x54, 0x6f, 0x50, 0x69, 0x6e, 0x67, 0x18, 0x02,
-	0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x50, 0x65, 0x72, 0x55,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x54, 0x6f,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x1f, 0x6d, 0x61, 0x78,
+	0x50, 0x69, 0x6e, 0x67, 0x12, 0x34, 0x0a, 0x15, 0x77, 0x69, 0x6c, 0x6c, 0x4b, 0x69, 0x63, 0x6b,
-	0x43, 0x68, 0x61, 0x73, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x46, 0x72, 0x61,
+	0x49, 0x66, 0x49, 0x6e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x46, 0x6f, 0x72, 0x18, 0x03, 0x20,
-	0x6d, 0x65, 0x73, 0x50, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x3c, 0x0a, 0x19,
+	0x01, 0x28, 0x05, 0x52, 0x15, 0x77, 0x69, 0x6c, 0x6c, 0x4b, 0x69, 0x63, 0x6b, 0x49, 0x66, 0x49,
-	0x72, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x45, 0x73, 0x74, 0x69, 0x6d, 0x61, 0x74, 0x65,
+	0x6e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x46, 0x6f, 0x72, 0x12, 0x20, 0x0a, 0x0b, 0x62, 0x6f,
-	0x64, 0x44, 0x74, 0x4d, 0x69, 0x6c, 0x6c, 0x69, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x01, 0x52,
+	0x75, 0x6e, 0x64, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x19, 0x72, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x45, 0x73, 0x74, 0x69, 0x6d, 0x61, 0x74,
+	0x0b, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x12, 0x30, 0x0a, 0x13,
-	0x65, 0x64, 0x44, 0x74, 0x4d, 0x69, 0x6c, 0x6c, 0x69, 0x73, 0x12, 0x3a, 0x0a, 0x18, 0x72, 0x6f,
+	0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61,
-	0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x45, 0x73, 0x74, 0x69, 0x6d, 0x61, 0x74, 0x65, 0x64, 0x44,
+	0x6e, 0x6f, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x13, 0x62, 0x61, 0x74, 0x74, 0x6c,
-	0x74, 0x4e, 0x61, 0x6e, 0x6f, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x18, 0x72, 0x6f,
+	0x65, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6e, 0x6f, 0x73, 0x12, 0x46,
-	0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x45, 0x73, 0x74, 0x69, 0x6d, 0x61, 0x74, 0x65, 0x64, 0x44,
+	0x0a, 0x1e, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x55, 0x70, 0x73, 0x79,
-	0x74, 0x4e, 0x61, 0x6e, 0x6f, 0x73, 0x12, 0x28, 0x0a, 0x0f, 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72,
+	0x6e, 0x63, 0x44, 0x65, 0x6c, 0x61, 0x79, 0x54, 0x6f, 0x6c, 0x65, 0x72, 0x61, 0x6e, 0x63, 0x65,
-	0x43, 0x61, 0x63, 0x68, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x1e, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x72, 0x61,
-	0x0f, 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x61, 0x63, 0x68, 0x65, 0x53, 0x69, 0x7a, 0x65,
+	0x6d, 0x65, 0x55, 0x70, 0x73, 0x79, 0x6e, 0x63, 0x44, 0x65, 0x6c, 0x61, 0x79, 0x54, 0x6f, 0x6c,
-	0x12, 0x22, 0x0a, 0x0c, 0x73, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x58,
+	0x65, 0x72, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x48, 0x0a, 0x1f, 0x6d, 0x61, 0x78, 0x43, 0x68, 0x61,
-	0x18, 0x0b, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0c, 0x73, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x66, 0x66,
+	0x73, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73,
-	0x73, 0x65, 0x74, 0x58, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x66, 0x66,
+	0x50, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x73, 0x65, 0x74, 0x59, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0c, 0x73, 0x70, 0x61, 0x63,
+	0x1f, 0x6d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x73, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x6e, 0x64, 0x65,
-	0x65, 0x4f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x59, 0x12, 0x2a, 0x0a, 0x10, 0x63, 0x6f, 0x6c, 0x6c,
+	0x72, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x73, 0x50, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x69, 0x73, 0x69, 0x6f, 0x6e, 0x4d, 0x69, 0x6e, 0x53, 0x74, 0x65, 0x70, 0x18, 0x0d, 0x20, 0x01,
+	0x12, 0x3c, 0x0a, 0x19, 0x72, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x45, 0x73, 0x74, 0x69,
-	0x28, 0x05, 0x52, 0x10, 0x63, 0x6f, 0x6c, 0x6c, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x4d, 0x69, 0x6e,
+	0x6d, 0x61, 0x74, 0x65, 0x64, 0x44, 0x74, 0x4d, 0x69, 0x6c, 0x6c, 0x69, 0x73, 0x18, 0x08, 0x20,
-	0x53, 0x74, 0x65, 0x70, 0x12, 0x39, 0x0a, 0x17, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x44, 0x61, 0x74,
+	0x01, 0x28, 0x01, 0x52, 0x19, 0x72, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x45, 0x73, 0x74,
-	0x61, 0x4c, 0x6f, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18,
+	0x69, 0x6d, 0x61, 0x74, 0x65, 0x64, 0x44, 0x74, 0x4d, 0x69, 0x6c, 0x6c, 0x69, 0x73, 0x12, 0x3a,
-	0x80, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x17, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x44, 0x61, 0x74,
+	0x0a, 0x18, 0x72, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x45, 0x73, 0x74, 0x69, 0x6d, 0x61,
-	0x61, 0x4c, 0x6f, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x22,
+	0x74, 0x65, 0x64, 0x44, 0x74, 0x4e, 0x61, 0x6e, 0x6f, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03,
-	0xc2, 0x03, 0x0a, 0x11, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e, 0x63,
+	0x52, 0x18, 0x72, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x45, 0x73, 0x74, 0x69, 0x6d, 0x61,
-	0x46, 0x72, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x74, 0x65, 0x64, 0x44, 0x74, 0x4e, 0x61, 0x6e, 0x6f, 0x73, 0x12, 0x28, 0x0a, 0x0f, 0x72, 0x65,
-	0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x36, 0x0a, 0x0a, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73,
+	0x6e, 0x64, 0x65, 0x72, 0x43, 0x61, 0x63, 0x68, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x0a, 0x20,
-	0x41, 0x72, 0x72, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x01, 0x28, 0x05, 0x52, 0x0f, 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x61, 0x63, 0x68, 0x65,
-	0x6f, 0x73, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x79, 0x6e,
+	0x53, 0x69, 0x7a, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x66, 0x66,
-	0x63, 0x52, 0x0a, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x41, 0x72, 0x72, 0x12, 0x26, 0x0a,
+	0x73, 0x65, 0x74, 0x58, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0c, 0x73, 0x70, 0x61, 0x63,
-	0x0e, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x4e, 0x61, 0x6e, 0x6f, 0x73, 0x18,
+	0x65, 0x4f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x58, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x70, 0x61, 0x63,
-	0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e,
+	0x65, 0x4f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x59, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0c,
-	0x4e, 0x61, 0x6e, 0x6f, 0x73, 0x12, 0x37, 0x0a, 0x0c, 0x6d, 0x65, 0x6c, 0x65, 0x65, 0x42, 0x75,
+	0x73, 0x70, 0x61, 0x63, 0x65, 0x4f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x59, 0x12, 0x2a, 0x0a, 0x10,
-	0x6c, 0x6c, 0x65, 0x74, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x70, 0x72,
+	0x63, 0x6f, 0x6c, 0x6c, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x4d, 0x69, 0x6e, 0x53, 0x74, 0x65, 0x70,
-	0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x4d, 0x65, 0x6c, 0x65, 0x65, 0x42, 0x75, 0x6c, 0x6c, 0x65, 0x74,
+	0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x10, 0x63, 0x6f, 0x6c, 0x6c, 0x69, 0x73, 0x69, 0x6f,
-	0x52, 0x0c, 0x6d, 0x65, 0x6c, 0x65, 0x65, 0x42, 0x75, 0x6c, 0x6c, 0x65, 0x74, 0x73, 0x12, 0x40,
+	0x6e, 0x4d, 0x69, 0x6e, 0x53, 0x74, 0x65, 0x70, 0x12, 0x39, 0x0a, 0x17, 0x66, 0x72, 0x61, 0x6d,
-	0x0a, 0x0f, 0x66, 0x69, 0x72, 0x65, 0x62, 0x61, 0x6c, 0x6c, 0x42, 0x75, 0x6c, 0x6c, 0x65, 0x74,
+	0x65, 0x44, 0x61, 0x74, 0x61, 0x4c, 0x6f, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x45, 0x6e, 0x61, 0x62,
-	0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73,
+	0x6c, 0x65, 0x64, 0x18, 0x80, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x17, 0x66, 0x72, 0x61, 0x6d,
-	0x2e, 0x46, 0x69, 0x72, 0x65, 0x62, 0x61, 0x6c, 0x6c, 0x42, 0x75, 0x6c, 0x6c, 0x65, 0x74, 0x52,
+	0x65, 0x44, 0x61, 0x74, 0x61, 0x4c, 0x6f, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x45, 0x6e, 0x61, 0x62,
-	0x0f, 0x66, 0x69, 0x72, 0x65, 0x62, 0x61, 0x6c, 0x6c, 0x42, 0x75, 0x6c, 0x6c, 0x65, 0x74, 0x73,
+	0x6c, 0x65, 0x64, 0x22, 0xc2, 0x03, 0x0a, 0x11, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x6f, 0x77, 0x6e,
-	0x12, 0x37, 0x0a, 0x16, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x55, 0x6e, 0x63, 0x6f, 0x6e,
+	0x73, 0x79, 0x6e, 0x63, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
-	0x66, 0x69, 0x72, 0x6d, 0x65, 0x64, 0x4d, 0x61, 0x73, 0x6b, 0x18, 0x80, 0x08, 0x20, 0x01, 0x28,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x36, 0x0a, 0x0a, 0x70, 0x6c, 0x61,
-	0x04, 0x52, 0x16, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x55, 0x6e, 0x63, 0x6f, 0x6e, 0x66,
+	0x79, 0x65, 0x72, 0x73, 0x41, 0x72, 0x72, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e,
-	0x69, 0x72, 0x6d, 0x65, 0x64, 0x4d, 0x61, 0x73, 0x6b, 0x12, 0x2d, 0x0a, 0x11, 0x73, 0x68, 0x6f,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x6f, 0x77,
-	0x75, 0x6c, 0x64, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x52, 0x65, 0x73, 0x79, 0x6e, 0x63, 0x18, 0x81,
+	0x6e, 0x73, 0x79, 0x6e, 0x63, 0x52, 0x0a, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x41, 0x72,
-	0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x46, 0x6f, 0x72,
+	0x72, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x4e, 0x61,
-	0x63, 0x65, 0x52, 0x65, 0x73, 0x79, 0x6e, 0x63, 0x12, 0x25, 0x0a, 0x0d, 0x73, 0x70, 0x65, 0x63,
+	0x6e, 0x6f, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x63, 0x6f, 0x75, 0x6e, 0x74,
-	0x69, 0x65, 0x73, 0x49, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x82, 0x08, 0x20, 0x03, 0x28, 0x05,
+	0x64, 0x6f, 0x77, 0x6e, 0x4e, 0x61, 0x6e, 0x6f, 0x73, 0x12, 0x37, 0x0a, 0x0c, 0x6d, 0x65, 0x6c,
-	0x52, 0x0d, 0x73, 0x70, 0x65, 0x63, 0x69, 0x65, 0x73, 0x49, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x12,
+	0x65, 0x65, 0x42, 0x75, 0x6c, 0x6c, 0x65, 0x74, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x33, 0x0a, 0x14, 0x62, 0x75, 0x6c, 0x6c, 0x65, 0x74, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x49, 0x64,
+	0x13, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x4d, 0x65, 0x6c, 0x65, 0x65, 0x42, 0x75,
-	0x43, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x83, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x14,
+	0x6c, 0x6c, 0x65, 0x74, 0x52, 0x0c, 0x6d, 0x65, 0x6c, 0x65, 0x65, 0x42, 0x75, 0x6c, 0x6c, 0x65,
-	0x62, 0x75, 0x6c, 0x6c, 0x65, 0x74, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x49, 0x64, 0x43, 0x6f, 0x75,
+	0x74, 0x73, 0x12, 0x40, 0x0a, 0x0f, 0x66, 0x69, 0x72, 0x65, 0x62, 0x61, 0x6c, 0x6c, 0x42, 0x75,
-	0x6e, 0x74, 0x65, 0x72, 0x42, 0x13, 0x5a, 0x11, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x73,
+	0x6c, 0x6c, 0x65, 0x74, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x70, 0x72,
-	0x72, 0x76, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x46, 0x69, 0x72, 0x65, 0x62, 0x61, 0x6c, 0x6c, 0x42, 0x75, 0x6c,
-	0x33,
+	0x6c, 0x65, 0x74, 0x52, 0x0f, 0x66, 0x69, 0x72, 0x65, 0x62, 0x61, 0x6c, 0x6c, 0x42, 0x75, 0x6c,
+	0x6c, 0x65, 0x74, 0x73, 0x12, 0x37, 0x0a, 0x16, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x55,
+	0x6e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x65, 0x64, 0x4d, 0x61, 0x73, 0x6b, 0x18, 0x80,
+	0x08, 0x20, 0x01, 0x28, 0x04, 0x52, 0x16, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x55, 0x6e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x65, 0x64, 0x4d, 0x61, 0x73, 0x6b, 0x12, 0x2d, 0x0a,
+	0x11, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x52, 0x65, 0x73, 0x79,
+	0x6e, 0x63, 0x18, 0x81, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x73, 0x68, 0x6f, 0x75, 0x6c,
+	0x64, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x52, 0x65, 0x73, 0x79, 0x6e, 0x63, 0x12, 0x25, 0x0a, 0x0d,
+	0x73, 0x70, 0x65, 0x63, 0x69, 0x65, 0x73, 0x49, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x82, 0x08,
+	0x20, 0x03, 0x28, 0x05, 0x52, 0x0d, 0x73, 0x70, 0x65, 0x63, 0x69, 0x65, 0x73, 0x49, 0x64, 0x4c,
+	0x69, 0x73, 0x74, 0x12, 0x33, 0x0a, 0x14, 0x62, 0x75, 0x6c, 0x6c, 0x65, 0x74, 0x4c, 0x6f, 0x63,
+	0x61, 0x6c, 0x49, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x83, 0x08, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x14, 0x62, 0x75, 0x6c, 0x6c, 0x65, 0x74, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x49,
+	0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x42, 0x13, 0x5a, 0x11, 0x62, 0x61, 0x74, 0x74,
+	0x6c, 0x65, 0x5f, 0x73, 0x72, 0x76, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

frontend/assets/resources/animation/Explosion.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "c7c2ac6e-f1ea-4233-b6a4-aa5b96b61e17",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

frontend/assets/resources/animation/Explosion/Fireball1Explosion.anim

@@ -0,0 +1,55 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "Fireball1Explosion",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.26666666666666666,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "f4ad4f9f-4890-450b-9334-68fe6b903893"
+            }
+          },
+          {
+            "frame": 0.05,
+            "value": {
+              "__uuid__": "c6a5994f-251d-4191-a550-dfef979bab59"
+            }
+          },
+          {
+            "frame": 0.11666666666666667,
+            "value": {
+              "__uuid__": "417e58d9-e364-47f7-9364-f31ad3452adc"
+            }
+          },
+          {
+            "frame": 0.15,
+            "value": {
+              "__uuid__": "8b566f26-b34d-4da6-bdaa-078358a5b685"
+            }
+          },
+          {
+            "frame": 0.2,
+            "value": {
+              "__uuid__": "6ec5f75d-307e-4292-b667-cbbb5a52c2f6"
+            }
+          },
+          {
+            "frame": 0.25,
+            "value": {
+              "__uuid__": "d89977f1-d927-4a08-9591-9feb1daf68c8"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

frontend/assets/resources/animation/Explosion/Fireball1Explosion.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "7941215a-2b8c-4798-954b-4f1b16d5f6f5",
+  "subMetas": {}
+}

frontend/assets/resources/animation/Explosion/MeleeExplosion1.anim

@@ -0,0 +1,79 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "MeleeExplosion1",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.16666666666666666,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "ab4866e8-ce52-4bc1-be19-b03687acf0d6"
+            }
+          },
+          {
+            "frame": 0.016666666666666666,
+            "value": {
+              "__uuid__": "67cc8a51-0ebe-49db-a941-7aabc5655ecf"
+            }
+          },
+          {
+            "frame": 0.03333333333333333,
+            "value": {
+              "__uuid__": "367592d0-3566-4b6a-8707-01d6a8dbe34a"
+            }
+          },
+          {
+            "frame": 0.05,
+            "value": {
+              "__uuid__": "cc336b1e-b5d8-4a89-96fc-7ada0e232389"
+            }
+          },
+          {
+            "frame": 0.06666666666666667,
+            "value": {
+              "__uuid__": "a457cc63-08bd-4cfa-b84a-7287d0343ecf"
+            }
+          },
+          {
+            "frame": 0.08333333333333333,
+            "value": {
+              "__uuid__": "89697d35-cde3-4392-a231-db91d4ede29b"
+            }
+          },
+          {
+            "frame": 0.1,
+            "value": {
+              "__uuid__": "3815bf7a-0a48-40e0-b791-0a0be9ec0da6"
+            }
+          },
+          {
+            "frame": 0.11666666666666667,
+            "value": {
+              "__uuid__": "20e691ee-a0c0-4710-8981-8dee1911e819"
+            }
+          },
+          {
+            "frame": 0.13333333333333333,
+            "value": {
+              "__uuid__": "94e678c5-0780-4f2b-bf3b-86c6c0a75c23"
+            }
+          },
+          {
+            "frame": 0.15,
+            "value": {
+              "__uuid__": "af4f9c62-4c7e-43a4-b9b3-dd3effbbbafb"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

frontend/assets/resources/animation/Explosion/MeleeExplosion1.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "954a2924-89df-4df4-93fc-36d2b22e7619",
+  "subMetas": {}
+}

frontend/assets/resources/animation/Explosion/MeleeExplosion2.anim

@@ -0,0 +1,79 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "MeleeExplosion2",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.26666666666666666,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "89e54317-7835-4d4c-9c04-579da8b33c54"
+            }
+          },
+          {
+            "frame": 0.016666666666666666,
+            "value": {
+              "__uuid__": "2a186e00-a0c5-4c8a-b0ab-c84d56dcee7c"
+            }
+          },
+          {
+            "frame": 0.05,
+            "value": {
+              "__uuid__": "083168e3-6ccc-4c5b-a800-2554bffc67d4"
+            }
+          },
+          {
+            "frame": 0.08333333333333333,
+            "value": {
+              "__uuid__": "d4b12ec9-6f04-493c-91e5-22b1a212262a"
+            }
+          },
+          {
+            "frame": 0.13333333333333333,
+            "value": {
+              "__uuid__": "13038788-b0f9-4714-960b-c98619a0d0ce"
+            }
+          },
+          {
+            "frame": 0.16666666666666666,
+            "value": {
+              "__uuid__": "94c21ed7-94a2-47a4-9537-fe5d9c51d7b0"
+            }
+          },
+          {
+            "frame": 0.2,
+            "value": {
+              "__uuid__": "d5340298-923c-4bd7-9fd7-7a2e029a2b44"
+            }
+          },
+          {
+            "frame": 0.21666666666666667,
+            "value": {
+              "__uuid__": "c4b145c0-0145-4e09-8559-9ef508d95be8"
+            }
+          },
+          {
+            "frame": 0.23333333333333334,
+            "value": {
+              "__uuid__": "79398d4d-305e-4987-b199-d9d9649cf490"
+            }
+          },
+          {
+            "frame": 0.25,
+            "value": {
+              "__uuid__": "c032eb65-fdf3-41e6-b868-d95df34168df"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

frontend/assets/resources/animation/Explosion/MeleeExplosion2.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "5bd304eb-c8ba-426f-a9ab-5698ac62de85",
+  "subMetas": {}
+}

frontend/assets/resources/animation/Explosion/MeleeExplosion3.anim

@@ -0,0 +1,79 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "MeleeExplosion3",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.26666666666666666,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "20d9ce6b-d9ab-4402-8c59-770ad0adf570"
+            }
+          },
+          {
+            "frame": 0.016666666666666666,
+            "value": {
+              "__uuid__": "0654601f-6788-4a2c-aed4-8dfbe1c5fdd0"
+            }
+          },
+          {
+            "frame": 0.03333333333333333,
+            "value": {
+              "__uuid__": "0913e11a-c796-4b58-94cf-f70b3869deff"
+            }
+          },
+          {
+            "frame": 0.06666666666666667,
+            "value": {
+              "__uuid__": "d6b58622-2cc3-4ee6-a34f-1a18deb73700"
+            }
+          },
+          {
+            "frame": 0.08333333333333333,
+            "value": {
+              "__uuid__": "b83c6261-b86f-4323-ad11-7375cac02a2b"
+            }
+          },
+          {
+            "frame": 0.11666666666666667,
+            "value": {
+              "__uuid__": "b458c047-b7b5-4476-996e-d4c1ca85ef9c"
+            }
+          },
+          {
+            "frame": 0.15,
+            "value": {
+              "__uuid__": "3971256a-8120-448e-8adf-de8d67dedfd3"
+            }
+          },
+          {
+            "frame": 0.18333333333333332,
+            "value": {
+              "__uuid__": "0e548d92-36c8-4795-b3dc-2bc2cfcd7170"
+            }
+          },
+          {
+            "frame": 0.21666666666666667,
+            "value": {
+              "__uuid__": "25f94245-87b0-4954-abab-c817c80fed37"
+            }
+          },
+          {
+            "frame": 0.25,
+            "value": {
+              "__uuid__": "20d9ce6b-d9ab-4402-8c59-770ad0adf570"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

frontend/assets/resources/animation/Explosion/MeleeExplosion3.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "5054633c-a588-4506-b4ac-eef29b1d8511",
+  "subMetas": {}
+}

frontend/assets/resources/animation/Explosion/MeleeExplosions.plist

@@ -0,0 +1,476 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>frames</key>
+        <dict>
+            <key>Explosion1_1.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{71,67}</string>
+                <key>spriteSourceSize</key>
+                <string>{71,67}</string>
+                <key>textureRect</key>
+                <string>{{0,506},{71,67}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>Explosion1_10.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{71,67}</string>
+                <key>spriteSourceSize</key>
+                <string>{71,67}</string>
+                <key>textureRect</key>
+                <string>{{0,577},{71,67}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>Explosion1_2.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{71,67}</string>
+                <key>spriteSourceSize</key>
+                <string>{71,67}</string>
+                <key>textureRect</key>
+                <string>{{67,506},{71,67}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>Explosion1_3.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{71,67}</string>
+                <key>spriteSourceSize</key>
+                <string>{71,67}</string>
+                <key>textureRect</key>
+                <string>{{67,577},{71,67}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>Explosion1_4.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{71,67}</string>
+                <key>spriteSourceSize</key>
+                <string>{71,67}</string>
+                <key>textureRect</key>
+                <string>{{134,506},{71,67}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>Explosion1_5.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{71,67}</string>
+                <key>spriteSourceSize</key>
+                <string>{71,67}</string>
+                <key>textureRect</key>
+                <string>{{134,577},{71,67}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>Explosion1_6.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{71,67}</string>
+                <key>spriteSourceSize</key>
+                <string>{71,67}</string>
+                <key>textureRect</key>
+                <string>{{355,503},{71,67}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>Explosion1_7.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{71,67}</string>
+                <key>spriteSourceSize</key>
+                <string>{71,67}</string>
+                <key>textureRect</key>
+                <string>{{426,503},{71,67}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>Explosion1_8.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{71,67}</string>
+                <key>spriteSourceSize</key>
+                <string>{71,67}</string>
+                <key>textureRect</key>
+                <string>{{355,570},{71,67}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>Explosion1_9.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{71,67}</string>
+                <key>spriteSourceSize</key>
+                <string>{71,67}</string>
+                <key>textureRect</key>
+                <string>{{422,570},{71,67}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>Explosion2_1.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{88,45}</string>
+                <key>spriteSourceSize</key>
+                <string>{88,45}</string>
+                <key>textureRect</key>
+                <string>{{462,0},{88,45}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>Explosion2_10.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{88,45}</string>
+                <key>spriteSourceSize</key>
+                <string>{88,45}</string>
+                <key>textureRect</key>
+                <string>{{462,88},{88,45}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>Explosion2_2.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{88,45}</string>
+                <key>spriteSourceSize</key>
+                <string>{88,45}</string>
+                <key>textureRect</key>
+                <string>{{462,176},{88,45}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>Explosion2_3.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{88,45}</string>
+                <key>spriteSourceSize</key>
+                <string>{88,45}</string>
+                <key>textureRect</key>
+                <string>{{462,264},{88,45}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>Explosion2_4.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{88,45}</string>
+                <key>spriteSourceSize</key>
+                <string>{88,45}</string>
+                <key>textureRect</key>
+                <string>{{0,304},{88,45}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>Explosion2_5.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{88,45}</string>
+                <key>spriteSourceSize</key>
+                <string>{88,45}</string>
+                <key>textureRect</key>
+                <string>{{88,304},{88,45}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>Explosion2_6.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{88,45}</string>
+                <key>spriteSourceSize</key>
+                <string>{88,45}</string>
+                <key>textureRect</key>
+                <string>{{176,304},{88,45}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>Explosion2_7.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{88,45}</string>
+                <key>spriteSourceSize</key>
+                <string>{88,45}</string>
+                <key>textureRect</key>
+                <string>{{264,304},{88,45}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>Explosion2_8.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{88,45}</string>
+                <key>spriteSourceSize</key>
+                <string>{88,45}</string>
+                <key>textureRect</key>
+                <string>{{352,304},{88,45}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>Explosion2_9.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{88,45}</string>
+                <key>spriteSourceSize</key>
+                <string>{88,45}</string>
+                <key>textureRect</key>
+                <string>{{456,352},{88,45}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>Explosion3_1.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{154,152}</string>
+                <key>spriteSourceSize</key>
+                <string>{154,152}</string>
+                <key>textureRect</key>
+                <string>{{0,0},{154,152}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>Explosion3_10.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{154,152}</string>
+                <key>spriteSourceSize</key>
+                <string>{154,152}</string>
+                <key>textureRect</key>
+                <string>{{154,0},{154,152}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>Explosion3_2.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{154,152}</string>
+                <key>spriteSourceSize</key>
+                <string>{154,152}</string>
+                <key>textureRect</key>
+                <string>{{308,0},{154,152}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>Explosion3_3.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{154,152}</string>
+                <key>spriteSourceSize</key>
+                <string>{154,152}</string>
+                <key>textureRect</key>
+                <string>{{0,152},{154,152}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>Explosion3_4.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{154,152}</string>
+                <key>spriteSourceSize</key>
+                <string>{154,152}</string>
+                <key>textureRect</key>
+                <string>{{154,152},{154,152}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>Explosion3_5.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{154,152}</string>
+                <key>spriteSourceSize</key>
+                <string>{154,152}</string>
+                <key>textureRect</key>
+                <string>{{308,152},{154,152}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>Explosion3_6.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{154,152}</string>
+                <key>spriteSourceSize</key>
+                <string>{154,152}</string>
+                <key>textureRect</key>
+                <string>{{0,352},{154,152}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>Explosion3_7.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{154,152}</string>
+                <key>spriteSourceSize</key>
+                <string>{154,152}</string>
+                <key>textureRect</key>
+                <string>{{152,349},{154,152}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>Explosion3_8.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{154,152}</string>
+                <key>spriteSourceSize</key>
+                <string>{154,152}</string>
+                <key>textureRect</key>
+                <string>{{201,503},{154,152}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>Explosion3_9.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{154,152}</string>
+                <key>spriteSourceSize</key>
+                <string>{154,152}</string>
+                <key>textureRect</key>
+                <string>{{304,349},{154,152}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+        </dict>
+        <key>metadata</key>
+        <dict>
+            <key>format</key>
+            <integer>3</integer>
+            <key>pixelFormat</key>
+            <string>RGBA8888</string>
+            <key>premultiplyAlpha</key>
+            <false/>
+            <key>realTextureFileName</key>
+            <string>MeleeExplosions.png</string>
+            <key>size</key>
+            <string>{507,655}</string>
+            <key>smartupdate</key>
+            <string>$TexturePacker:SmartUpdate:6c1498ee6f30bdad4abeb6a9f6af8367:4c81e1a1720f2ad3535ac93f1b42991f:d9b184ec81b83b14db5cf31d298727df$</string>
+            <key>textureFileName</key>
+            <string>MeleeExplosions.png</string>
+        </dict>
+    </dict>
+</plist>

frontend/assets/resources/animation/Explosion/MeleeExplosions.plist.meta

@@ -0,0 +1,672 @@
+{
+  "ver": "1.2.4",
+  "uuid": "1c4c1dcb-54af-485b-9119-abd6d6d84526",
+  "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+  "size": {
+    "width": 507,
+    "height": 655
+  },
+  "type": "Texture Packer",
+  "subMetas": {
+    "Explosion1_1.png": {
+      "ver": "1.0.4",
+      "uuid": "ab4866e8-ce52-4bc1-be19-b03687acf0d6",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 506,
+      "width": 71,
+      "height": 67,
+      "rawWidth": 71,
+      "rawHeight": 67,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion1_10.png": {
+      "ver": "1.0.4",
+      "uuid": "af4f9c62-4c7e-43a4-b9b3-dd3effbbbafb",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 577,
+      "width": 71,
+      "height": 67,
+      "rawWidth": 71,
+      "rawHeight": 67,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion1_2.png": {
+      "ver": "1.0.4",
+      "uuid": "67cc8a51-0ebe-49db-a941-7aabc5655ecf",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 67,
+      "trimY": 506,
+      "width": 71,
+      "height": 67,
+      "rawWidth": 71,
+      "rawHeight": 67,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion1_3.png": {
+      "ver": "1.0.4",
+      "uuid": "367592d0-3566-4b6a-8707-01d6a8dbe34a",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 67,
+      "trimY": 577,
+      "width": 71,
+      "height": 67,
+      "rawWidth": 71,
+      "rawHeight": 67,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion1_4.png": {
+      "ver": "1.0.4",
+      "uuid": "cc336b1e-b5d8-4a89-96fc-7ada0e232389",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 134,
+      "trimY": 506,
+      "width": 71,
+      "height": 67,
+      "rawWidth": 71,
+      "rawHeight": 67,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion1_5.png": {
+      "ver": "1.0.4",
+      "uuid": "a457cc63-08bd-4cfa-b84a-7287d0343ecf",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 134,
+      "trimY": 577,
+      "width": 71,
+      "height": 67,
+      "rawWidth": 71,
+      "rawHeight": 67,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion1_6.png": {
+      "ver": "1.0.4",
+      "uuid": "89697d35-cde3-4392-a231-db91d4ede29b",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 355,
+      "trimY": 503,
+      "width": 71,
+      "height": 67,
+      "rawWidth": 71,
+      "rawHeight": 67,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion1_7.png": {
+      "ver": "1.0.4",
+      "uuid": "3815bf7a-0a48-40e0-b791-0a0be9ec0da6",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 426,
+      "trimY": 503,
+      "width": 71,
+      "height": 67,
+      "rawWidth": 71,
+      "rawHeight": 67,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion1_8.png": {
+      "ver": "1.0.4",
+      "uuid": "20e691ee-a0c0-4710-8981-8dee1911e819",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 355,
+      "trimY": 570,
+      "width": 71,
+      "height": 67,
+      "rawWidth": 71,
+      "rawHeight": 67,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion1_9.png": {
+      "ver": "1.0.4",
+      "uuid": "94e678c5-0780-4f2b-bf3b-86c6c0a75c23",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 422,
+      "trimY": 570,
+      "width": 71,
+      "height": 67,
+      "rawWidth": 71,
+      "rawHeight": 67,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion2_1.png": {
+      "ver": "1.0.4",
+      "uuid": "89e54317-7835-4d4c-9c04-579da8b33c54",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 462,
+      "trimY": 0,
+      "width": 88,
+      "height": 45,
+      "rawWidth": 88,
+      "rawHeight": 45,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion2_10.png": {
+      "ver": "1.0.4",
+      "uuid": "c032eb65-fdf3-41e6-b868-d95df34168df",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 462,
+      "trimY": 88,
+      "width": 88,
+      "height": 45,
+      "rawWidth": 88,
+      "rawHeight": 45,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion2_2.png": {
+      "ver": "1.0.4",
+      "uuid": "2a186e00-a0c5-4c8a-b0ab-c84d56dcee7c",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 462,
+      "trimY": 176,
+      "width": 88,
+      "height": 45,
+      "rawWidth": 88,
+      "rawHeight": 45,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion2_3.png": {
+      "ver": "1.0.4",
+      "uuid": "083168e3-6ccc-4c5b-a800-2554bffc67d4",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 462,
+      "trimY": 264,
+      "width": 88,
+      "height": 45,
+      "rawWidth": 88,
+      "rawHeight": 45,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion2_4.png": {
+      "ver": "1.0.4",
+      "uuid": "d4b12ec9-6f04-493c-91e5-22b1a212262a",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 304,
+      "width": 88,
+      "height": 45,
+      "rawWidth": 88,
+      "rawHeight": 45,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion2_5.png": {
+      "ver": "1.0.4",
+      "uuid": "13038788-b0f9-4714-960b-c98619a0d0ce",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 88,
+      "trimY": 304,
+      "width": 88,
+      "height": 45,
+      "rawWidth": 88,
+      "rawHeight": 45,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion2_6.png": {
+      "ver": "1.0.4",
+      "uuid": "94c21ed7-94a2-47a4-9537-fe5d9c51d7b0",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 176,
+      "trimY": 304,
+      "width": 88,
+      "height": 45,
+      "rawWidth": 88,
+      "rawHeight": 45,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion2_7.png": {
+      "ver": "1.0.4",
+      "uuid": "d5340298-923c-4bd7-9fd7-7a2e029a2b44",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 264,
+      "trimY": 304,
+      "width": 88,
+      "height": 45,
+      "rawWidth": 88,
+      "rawHeight": 45,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion2_8.png": {
+      "ver": "1.0.4",
+      "uuid": "c4b145c0-0145-4e09-8559-9ef508d95be8",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 352,
+      "trimY": 304,
+      "width": 88,
+      "height": 45,
+      "rawWidth": 88,
+      "rawHeight": 45,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion2_9.png": {
+      "ver": "1.0.4",
+      "uuid": "79398d4d-305e-4987-b199-d9d9649cf490",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 456,
+      "trimY": 352,
+      "width": 88,
+      "height": 45,
+      "rawWidth": 88,
+      "rawHeight": 45,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion3_1.png": {
+      "ver": "1.0.4",
+      "uuid": "84e28787-c6cb-435b-8f59-20d9afe6bf3a",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 154,
+      "height": 152,
+      "rawWidth": 154,
+      "rawHeight": 152,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion3_10.png": {
+      "ver": "1.0.4",
+      "uuid": "20d9ce6b-d9ab-4402-8c59-770ad0adf570",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 154,
+      "trimY": 0,
+      "width": 154,
+      "height": 152,
+      "rawWidth": 154,
+      "rawHeight": 152,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion3_2.png": {
+      "ver": "1.0.4",
+      "uuid": "0654601f-6788-4a2c-aed4-8dfbe1c5fdd0",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 308,
+      "trimY": 0,
+      "width": 154,
+      "height": 152,
+      "rawWidth": 154,
+      "rawHeight": 152,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion3_3.png": {
+      "ver": "1.0.4",
+      "uuid": "0913e11a-c796-4b58-94cf-f70b3869deff",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 152,
+      "width": 154,
+      "height": 152,
+      "rawWidth": 154,
+      "rawHeight": 152,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion3_4.png": {
+      "ver": "1.0.4",
+      "uuid": "d6b58622-2cc3-4ee6-a34f-1a18deb73700",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 154,
+      "trimY": 152,
+      "width": 154,
+      "height": 152,
+      "rawWidth": 154,
+      "rawHeight": 152,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion3_5.png": {
+      "ver": "1.0.4",
+      "uuid": "b83c6261-b86f-4323-ad11-7375cac02a2b",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 308,
+      "trimY": 152,
+      "width": 154,
+      "height": 152,
+      "rawWidth": 154,
+      "rawHeight": 152,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion3_6.png": {
+      "ver": "1.0.4",
+      "uuid": "b458c047-b7b5-4476-996e-d4c1ca85ef9c",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 352,
+      "width": 154,
+      "height": 152,
+      "rawWidth": 154,
+      "rawHeight": 152,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion3_7.png": {
+      "ver": "1.0.4",
+      "uuid": "3971256a-8120-448e-8adf-de8d67dedfd3",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 152,
+      "trimY": 349,
+      "width": 154,
+      "height": 152,
+      "rawWidth": 154,
+      "rawHeight": 152,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion3_8.png": {
+      "ver": "1.0.4",
+      "uuid": "0e548d92-36c8-4795-b3dc-2bc2cfcd7170",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 201,
+      "trimY": 503,
+      "width": 154,
+      "height": 152,
+      "rawWidth": 154,
+      "rawHeight": 152,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "Explosion3_9.png": {
+      "ver": "1.0.4",
+      "uuid": "25f94245-87b0-4954-abab-c817c80fed37",
+      "rawTextureUuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 304,
+      "trimY": 349,
+      "width": 154,
+      "height": 152,
+      "rawWidth": 154,
+      "rawHeight": 152,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    }
+  }
+}

frontend/assets/resources/animation/Explosion/MeleeExplosions.png.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "2.3.3",
+  "uuid": "b11569aa-2e43-4084-a3e5-42eec243c4eb",
+  "type": "raw",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {}
+}

frontend/assets/resources/animation/Fireball.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "b07a911d-2d61-486d-9edc-1b3ba53c9911",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

frontend/assets/resources/animation/Fireball/Fireball1.anim

@@ -0,0 +1,145 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "Fireball1",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.35,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 2,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "dbe67025-9878-4e13-8f3d-81e04734810a"
+            }
+          },
+          {
+            "frame": 0.016666666666666666,
+            "value": {
+              "__uuid__": "e92702d5-d5fd-49e6-ab6b-2296b43fa6d6"
+            }
+          },
+          {
+            "frame": 0.03333333333333333,
+            "value": {
+              "__uuid__": "e1a89340-0b92-4e6b-93f2-e983302d70ce"
+            }
+          },
+          {
+            "frame": 0.05,
+            "value": {
+              "__uuid__": "b0bb4a7a-4ae3-48fc-9913-3b6d1d36c56f"
+            }
+          },
+          {
+            "frame": 0.06666666666666667,
+            "value": {
+              "__uuid__": "b44d585b-8e18-4767-b263-ed3a53cd3250"
+            }
+          },
+          {
+            "frame": 0.08333333333333333,
+            "value": {
+              "__uuid__": "a87a9ea8-2d84-4a3b-83e3-a4d7b8ac96b8"
+            }
+          },
+          {
+            "frame": 0.1,
+            "value": {
+              "__uuid__": "a1604f9d-c0ea-4f92-b09b-3608245bda8e"
+            }
+          },
+          {
+            "frame": 0.11666666666666667,
+            "value": {
+              "__uuid__": "4372818f-1e44-4180-a0ce-4a34cee4fc5b"
+            }
+          },
+          {
+            "frame": 0.13333333333333333,
+            "value": {
+              "__uuid__": "dbe67025-9878-4e13-8f3d-81e04734810a"
+            }
+          },
+          {
+            "frame": 0.15,
+            "value": {
+              "__uuid__": "5d867617-7f50-4fa8-804d-ce28c47ea407"
+            }
+          },
+          {
+            "frame": 0.16666666666666666,
+            "value": {
+              "__uuid__": "824c9bee-42b7-4a94-86f8-6356f11aee16"
+            }
+          },
+          {
+            "frame": 0.18333333333333332,
+            "value": {
+              "__uuid__": "6389164e-93bb-4d4d-9740-5e2d5cdb1029"
+            }
+          },
+          {
+            "frame": 0.2,
+            "value": {
+              "__uuid__": "d184a083-6043-4ca6-bd14-8db1b6be1d2e"
+            }
+          },
+          {
+            "frame": 0.21666666666666667,
+            "value": {
+              "__uuid__": "361b1722-e362-46e5-939e-e2d1666df374"
+            }
+          },
+          {
+            "frame": 0.23333333333333334,
+            "value": {
+              "__uuid__": "662fbe4f-a1f4-46f7-83e4-eafd021432da"
+            }
+          },
+          {
+            "frame": 0.25,
+            "value": {
+              "__uuid__": "5e509118-a44b-4e7f-9686-c6bb0b30f0b0"
+            }
+          },
+          {
+            "frame": 0.26666666666666666,
+            "value": {
+              "__uuid__": "bc1110c7-4423-4c43-965c-0cb3dd8e31ff"
+            }
+          },
+          {
+            "frame": 0.2833333333333333,
+            "value": {
+              "__uuid__": "33cc8d11-1568-47a7-b4f1-cef4888302e5"
+            }
+          },
+          {
+            "frame": 0.3,
+            "value": {
+              "__uuid__": "83bb5dd3-510c-4fce-b393-840f14efb8cd"
+            }
+          },
+          {
+            "frame": 0.31666666666666665,
+            "value": {
+              "__uuid__": "1db706f5-366a-421c-843f-a4bb016f80ec"
+            }
+          },
+          {
+            "frame": 0.3333333333333333,
+            "value": {
+              "__uuid__": "41a4f35a-01c0-4a22-b5cc-7bfe25ed4501"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

frontend/assets/resources/animation/Fireball/Fireball1.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "ba12416b-eec3-4260-8402-7fc25b125624",
+  "subMetas": {}
+}

frontend/assets/resources/animation/KnifeGirl/Dashing.anim

@@ -0,0 +1,61 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "Dashing",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.35,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "cf396dac-50c9-4389-90c0-55f49fd3276d"
+            }
+          },
+          {
+            "frame": 0.05,
+            "value": {
+              "__uuid__": "b9e4b5d5-c296-48c8-aa60-d22db0e5a632"
+            }
+          },
+          {
+            "frame": 0.11666666666666667,
+            "value": {
+              "__uuid__": "e456c710-69f5-4dcc-9f5d-dd486a9198a1"
+            }
+          },
+          {
+            "frame": 0.16666666666666666,
+            "value": {
+              "__uuid__": "ec6df76f-0004-4216-9b83-449487fe0cda"
+            }
+          },
+          {
+            "frame": 0.23333333333333334,
+            "value": {
+              "__uuid__": "26032d0f-845c-4b96-89a6-d88113ed7827"
+            }
+          },
+          {
+            "frame": 0.2833333333333333,
+            "value": {
+              "__uuid__": "e3e0169c-3c56-4206-a20e-35e4d0471873"
+            }
+          },
+          {
+            "frame": 0.3333333333333333,
+            "value": {
+              "__uuid__": "80b98036-c5de-492b-b0e8-f1703f3a7d20"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

frontend/assets/resources/animation/KnifeGirl/Dashing.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "38b2c892-347b-4009-93f8-65b2ab1614f0",
+  "subMetas": {}
+}

frontend/assets/resources/animation/KnifeGirl/KnifeGirl.plist

@@ -15,9 +15,9 @@
                 <key>spriteSourceSize</key>
                 <string>{112,128}</string>
                 <key>textureRect</key>
-                <string>{{824,544},{112,128}}</string>
+                <string>{{806,750},{112,128}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Atk1_1.png</key>
             <dict>
@@ -30,9 +30,9 @@
                 <key>spriteSourceSize</key>
                 <string>{112,128}</string>
                 <key>textureRect</key>
-                <string>{{0,1200},{112,128}}</string>
+                <string>{{0,1076},{112,128}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Atk1_10.png</key>
             <dict>
@@ -60,7 +60,7 @@
                 <key>spriteSourceSize</key>
                 <string>{80,128}</string>
                 <key>textureRect</key>
-                <string>{{940,0},{80,128}}</string>
+                <string>{{528,515},{80,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -75,7 +75,7 @@
                 <key>spriteSourceSize</key>
                 <string>{80,128}</string>
                 <key>textureRect</key>
-                <string>{{940,128},{80,128}}</string>
+                <string>{{934,640},{80,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -90,9 +90,9 @@
                 <key>spriteSourceSize</key>
                 <string>{112,128}</string>
                 <key>textureRect</key>
-                <string>{{0,964},{112,128}}</string>
+                <string>{{128,1076},{112,128}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Atk1_4.png</key>
             <dict>
@@ -105,9 +105,9 @@
                 <key>spriteSourceSize</key>
                 <string>{112,128}</string>
                 <key>textureRect</key>
-                <string>{{112,964},{112,128}}</string>
+                <string>{{678,862},{112,128}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Atk1_5.png</key>
             <dict>
@@ -120,7 +120,7 @@
                 <key>spriteSourceSize</key>
                 <string>{96,128}</string>
                 <key>textureRect</key>
-                <string>{{840,288},{96,128}}</string>
+                <string>{{512,643},{96,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -135,7 +135,7 @@
                 <key>spriteSourceSize</key>
                 <string>{96,128}</string>
                 <key>textureRect</key>
-                <string>{{840,416},{96,128}}</string>
+                <string>{{512,771},{96,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -150,7 +150,7 @@
                 <key>spriteSourceSize</key>
                 <string>{80,128}</string>
                 <key>textureRect</key>
-                <string>{{940,256},{80,128}}</string>
+                <string>{{934,768},{80,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -165,7 +165,7 @@
                 <key>spriteSourceSize</key>
                 <string>{80,128}</string>
                 <key>textureRect</key>
-                <string>{{936,384},{80,128}}</string>
+                <string>{{934,896},{80,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -180,9 +180,9 @@
                 <key>spriteSourceSize</key>
                 <string>{80,128}</string>
                 <key>textureRect</key>
-                <string>{{936,512},{80,128}}</string>
+                <string>{{806,958},{80,128}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Atk2_0.png</key>
             <dict>
@@ -195,7 +195,7 @@
                 <key>spriteSourceSize</key>
                 <string>{80,128}</string>
                 <key>textureRect</key>
-                <string>{{936,640},{80,128}}</string>
+                <string>{{934,1024},{80,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -210,7 +210,7 @@
                 <key>spriteSourceSize</key>
                 <string>{96,128}</string>
                 <key>textureRect</key>
-                <string>{{582,531},{96,128}}</string>
+                <string>{{512,899},{96,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -225,7 +225,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,112}</string>
                 <key>textureRect</key>
-                <string>{{326,871},{128,112}}</string>
+                <string>{{128,964},{128,112}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -240,7 +240,7 @@
                 <key>spriteSourceSize</key>
                 <string>{96,96}</string>
                 <key>textureRect</key>
-                <string>{{696,1200},{96,96}}</string>
+                <string>{{912,1152},{96,96}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -255,7 +255,7 @@
                 <key>spriteSourceSize</key>
                 <string>{96,112}</string>
                 <key>textureRect</key>
-                <string>{{416,983},{96,112}}</string>
+                <string>{{340,1197},{96,112}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -270,7 +270,7 @@
                 <key>spriteSourceSize</key>
                 <string>{96,112}</string>
                 <key>textureRect</key>
-                <string>{{656,1092},{96,112}}</string>
+                <string>{{452,1196},{96,112}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -285,9 +285,9 @@
                 <key>spriteSourceSize</key>
                 <string>{96,112}</string>
                 <key>textureRect</key>
-                <string>{{528,1113},{96,112}}</string>
+                <string>{{564,1155},{96,112}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>Atk2_5.png</key>
             <dict>
@@ -300,9 +300,9 @@
                 <key>spriteSourceSize</key>
                 <string>{96,112}</string>
                 <key>textureRect</key>
-                <string>{{392,1207},{96,112}}</string>
+                <string>{{608,1043},{96,112}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>Atk2_6.png</key>
             <dict>
@@ -330,7 +330,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,112}</string>
                 <key>textureRect</key>
-                <string>{{454,871},{128,112}}</string>
+                <string>{{678,750},{128,112}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -525,7 +525,7 @@
                 <key>spriteSourceSize</key>
                 <string>{96,128}</string>
                 <key>textureRect</key>
-                <string>{{582,659},{96,128}}</string>
+                <string>{{512,1027},{96,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -540,7 +540,7 @@
                 <key>spriteSourceSize</key>
                 <string>{112,112}</string>
                 <key>textureRect</key>
-                <string>{{240,1081},{112,112}}</string>
+                <string>{{448,1293},{112,112}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -555,7 +555,7 @@
                 <key>spriteSourceSize</key>
                 <string>{96,112}</string>
                 <key>textureRect</key>
-                <string>{{504,1209},{96,112}}</string>
+                <string>{{660,1155},{96,112}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -570,7 +570,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,112}</string>
                 <key>textureRect</key>
-                <string>{{678,980},{128,112}}</string>
+                <string>{{384,988},{128,112}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -634,6 +634,111 @@
                 <key>textureRotated</key>
                 <false/>
             </dict>
+            <key>Dashing_1.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{114,112}</string>
+                <key>spriteSourceSize</key>
+                <string>{114,112}</string>
+                <key>textureRect</key>
+                <string>{{0,1188},{114,112}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>Dashing_2.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{114,112}</string>
+                <key>spriteSourceSize</key>
+                <string>{114,112}</string>
+                <key>textureRect</key>
+                <string>{{114,1188},{114,112}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>Dashing_3.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{114,112}</string>
+                <key>spriteSourceSize</key>
+                <string>{114,112}</string>
+                <key>textureRect</key>
+                <string>{{0,1300},{114,112}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>Dashing_4.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{114,112}</string>
+                <key>spriteSourceSize</key>
+                <string>{114,112}</string>
+                <key>textureRect</key>
+                <string>{{112,1300},{114,112}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>Dashing_5.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{114,112}</string>
+                <key>spriteSourceSize</key>
+                <string>{114,112}</string>
+                <key>textureRect</key>
+                <string>{{0,1300},{114,112}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>Dashing_6.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{114,112}</string>
+                <key>spriteSourceSize</key>
+                <string>{114,112}</string>
+                <key>textureRect</key>
+                <string>{{224,1300},{114,112}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>Dashing_7.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{114,112}</string>
+                <key>spriteSourceSize</key>
+                <string>{114,112}</string>
+                <key>textureRect</key>
+                <string>{{336,1293},{114,112}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
             <key>GetUp1_1.png</key>
             <dict>
                 <key>aliases</key>
@@ -645,7 +750,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,118}</string>
                 <key>textureRect</key>
-                <string>{{806,791},{128,118}}</string>
+                <string>{{384,634},{128,118}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -660,7 +765,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,118}</string>
                 <key>textureRect</key>
-                <string>{{0,846},{128,118}}</string>
+                <string>{{384,752},{128,118}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -675,7 +780,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,118}</string>
                 <key>textureRect</key>
-                <string>{{128,846},{128,118}}</string>
+                <string>{{256,753},{128,118}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -690,7 +795,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,118}</string>
                 <key>textureRect</key>
-                <string>{{326,753},{128,118}}</string>
+                <string>{{128,846},{128,118}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -705,7 +810,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,118}</string>
                 <key>textureRect</key>
-                <string>{{454,753},{128,118}}</string>
+                <string>{{0,958},{128,118}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -720,7 +825,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,118}</string>
                 <key>textureRect</key>
-                <string>{{678,862},{128,118}}</string>
+                <string>{{384,870},{128,118}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -735,7 +840,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,118}</string>
                 <key>textureRect</key>
-                <string>{{806,909},{128,118}}</string>
+                <string>{{256,871},{128,118}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -750,7 +855,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{256,489},{70,128}}</string>
+                <string>{{940,0},{70,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -765,7 +870,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{256,617},{70,128}}</string>
+                <string>{{940,128},{70,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -780,7 +885,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{256,745},{70,128}}</string>
+                <string>{{940,256},{70,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -795,7 +900,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{256,873},{70,128}}</string>
+                <string>{{937,384},{70,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -810,7 +915,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{112,1200},{70,128}}</string>
+                <string>{{936,512},{70,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -825,7 +930,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{182,1200},{70,128}}</string>
+                <string>{{608,531},{70,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -840,7 +945,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{252,1200},{70,128}}</string>
+                <string>{{608,659},{70,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -855,7 +960,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{252,1200},{70,128}}</string>
+                <string>{{608,659},{70,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -870,7 +975,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{182,1200},{70,128}}</string>
+                <string>{{608,531},{70,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -885,7 +990,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{112,1200},{70,128}}</string>
+                <string>{{936,512},{70,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -900,7 +1005,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{256,873},{70,128}}</string>
+                <string>{{937,384},{70,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -915,7 +1020,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{256,745},{70,128}}</string>
+                <string>{{940,256},{70,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -930,7 +1035,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{256,617},{70,128}}</string>
+                <string>{{940,128},{70,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -945,7 +1050,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{322,1200},{70,128}}</string>
+                <string>{{608,787},{70,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -960,9 +1065,9 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{528,1043},{70,128}}</string>
+                <string>{{608,915},{70,128}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>InAirAtk1_0.png</key>
             <dict>
@@ -975,7 +1080,7 @@
                 <key>spriteSourceSize</key>
                 <string>{112,96}</string>
                 <key>textureRect</key>
-                <string>{{128,1092},{112,96}}</string>
+                <string>{{228,1197},{112,96}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1005,7 +1110,7 @@
                 <key>spriteSourceSize</key>
                 <string>{144,112}</string>
                 <key>textureRect</key>
-                <string>{{680,512},{144,112}}</string>
+                <string>{{0,489},{144,112}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1020,7 +1125,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,112}</string>
                 <key>textureRect</key>
-                <string>{{806,1027},{128,112}}</string>
+                <string>{{256,989},{128,112}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1035,7 +1140,7 @@
                 <key>spriteSourceSize</key>
                 <string>{96,96}</string>
                 <key>textureRect</key>
-                <string>{{792,1139},{96,96}}</string>
+                <string>{{672,1363},{96,96}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1050,7 +1155,7 @@
                 <key>spriteSourceSize</key>
                 <string>{80,96}</string>
                 <key>textureRect</key>
-                <string>{{934,1104},{80,96}}</string>
+                <string>{{672,1267},{80,96}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1065,7 +1170,7 @@
                 <key>spriteSourceSize</key>
                 <string>{112,112}</string>
                 <key>textureRect</key>
-                <string>{{352,1081},{112,112}}</string>
+                <string>{{560,1292},{112,112}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1080,7 +1185,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,96}</string>
                 <key>textureRect</key>
-                <string>{{0,1092},{128,96}}</string>
+                <string>{{384,1100},{128,96}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1095,9 +1200,9 @@
                 <key>spriteSourceSize</key>
                 <string>{80,112}</string>
                 <key>textureRect</key>
-                <string>{{934,768},{80,112}}</string>
+                <string>{{800,1038},{80,112}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>InAirIdle1_1.png</key>
             <dict>
@@ -1110,9 +1215,9 @@
                 <key>spriteSourceSize</key>
                 <string>{80,112}</string>
                 <key>textureRect</key>
-                <string>{{934,880},{80,112}}</string>
+                <string>{{800,1118},{80,112}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>InAirIdle1_2.png</key>
             <dict>
@@ -1125,9 +1230,9 @@
                 <key>spriteSourceSize</key>
                 <string>{64,128}</string>
                 <key>textureRect</key>
-                <string>{{464,1079},{64,128}}</string>
+                <string>{{678,974},{64,128}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>InAirIdle1_3.png</key>
             <dict>
@@ -1140,9 +1245,9 @@
                 <key>spriteSourceSize</key>
                 <string>{80,112}</string>
                 <key>textureRect</key>
-                <string>{{934,992},{80,112}}</string>
+                <string>{{756,1198},{80,112}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>InAirIdle1_4.png</key>
             <dict>
@@ -1155,7 +1260,7 @@
                 <key>spriteSourceSize</key>
                 <string>{80,96}</string>
                 <key>textureRect</key>
-                <string>{{224,1001},{80,96}}</string>
+                <string>{{752,1278},{80,96}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1170,9 +1275,9 @@
                 <key>spriteSourceSize</key>
                 <string>{80,96}</string>
                 <key>textureRect</key>
-                <string>{{320,1001},{80,96}}</string>
+                <string>{{768,1358},{80,96}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>InAirIdle1_6.png</key>
             <dict>
@@ -1185,9 +1290,9 @@
                 <key>spriteSourceSize</key>
                 <string>{80,96}</string>
                 <key>textureRect</key>
-                <string>{{792,1235},{80,96}}</string>
+                <string>{{868,1248},{80,96}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>InAirIdle1_7.png</key>
             <dict>
@@ -1200,7 +1305,7 @@
                 <key>spriteSourceSize</key>
                 <string>{96,112}</string>
                 <key>textureRect</key>
-                <string>{{600,1209},{96,112}}</string>
+                <string>{{704,1038},{96,112}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1215,9 +1320,9 @@
                 <key>spriteSourceSize</key>
                 <string>{96,128}</string>
                 <key>textureRect</key>
-                <string>{{582,787},{96,128}}</string>
+                <string>{{256,1101},{96,128}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>InAirIdle1_9.png</key>
             <dict>
@@ -1230,9 +1335,9 @@
                 <key>spriteSourceSize</key>
                 <string>{96,128}</string>
                 <key>textureRect</key>
-                <string>{{582,915},{96,128}}</string>
+                <string>{{806,862},{96,128}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>LayDown1_1.png</key>
             <dict>
@@ -1264,6 +1369,51 @@
                 <key>textureRotated</key>
                 <false/>
             </dict>
+            <key>OnWall1_1.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{112,97}</string>
+                <key>spriteSourceSize</key>
+                <string>{112,97}</string>
+                <key>textureRect</key>
+                <string>{{840,288},{112,97}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>OnWall1_2.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{112,97}</string>
+                <key>spriteSourceSize</key>
+                <string>{112,97}</string>
+                <key>textureRect</key>
+                <string>{{840,400},{112,97}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>OnWall1_3.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{112,97}</string>
+                <key>spriteSourceSize</key>
+                <string>{112,97}</string>
+                <key>textureRect</key>
+                <string>{{840,400},{112,97}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
             <key>Walking_1.png</key>
             <dict>
                 <key>aliases</key>
@@ -1275,7 +1425,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{0,489},{119,128}}</string>
+                <string>{{144,489},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1290,7 +1440,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{128,489},{119,128}}</string>
+                <string>{{0,601},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1305,7 +1455,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{0,608},{119,128}}</string>
+                <string>{{680,512},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1320,7 +1470,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{128,608},{119,128}}</string>
+                <string>{{808,512},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1335,7 +1485,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{326,515},{119,128}}</string>
+                <string>{{272,515},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1350,7 +1500,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{454,515},{119,128}}</string>
+                <string>{{128,608},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1365,7 +1515,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{678,624},{119,128}}</string>
+                <string>{{0,720},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1380,7 +1530,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{806,672},{119,128}}</string>
+                <string>{{400,515},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1395,7 +1545,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{0,727},{119,128}}</string>
+                <string>{{678,631},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1410,7 +1560,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{128,727},{119,128}}</string>
+                <string>{{806,631},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1425,7 +1575,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{326,634},{119,128}}</string>
+                <string>{{256,634},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1440,7 +1590,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{454,634},{119,128}}</string>
+                <string>{{128,727},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1455,7 +1605,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{678,743},{119,128}}</string>
+                <string>{{0,839},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1471,9 +1621,9 @@
             <key>realTextureFileName</key>
             <string>KnifeGirl.png</string>
             <key>size</key>
-            <string>{1020,1331}</string>
+            <string>{1014,1459}</string>
             <key>smartupdate</key>
-            <string>$TexturePacker:SmartUpdate:9514b6b35473e14baf98f68515bcb817:1aae9dd4a8024ce783fdab093a39672a:1ae107e0c6667a1ecb5ed98687517e0e$</string>
+            <string>$TexturePacker:SmartUpdate:4ca72309f7dc04bba6be361462471d91:9a48d10caa37a76ff8c43fb72bce6103:1ae107e0c6667a1ecb5ed98687517e0e$</string>
             <key>textureFileName</key>
             <string>KnifeGirl.png</string>
         </dict>

frontend/assets/resources/animation/KnifeGirl/OnWall.anim

@@ -0,0 +1,37 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "OnWall",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.26666666666666666,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "c18886db-8116-4602-84f2-51652a90269a"
+            }
+          },
+          {
+            "frame": 0.13333333333333333,
+            "value": {
+              "__uuid__": "0d81cbf0-dff8-4672-99b3-2ec8055c6931"
+            }
+          },
+          {
+            "frame": 0.25,
+            "value": {
+              "__uuid__": "a183e740-3c2d-4890-8430-39a00f55f446"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

frontend/assets/resources/animation/KnifeGirl/OnWall.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "411f964a-4dd8-424c-b2e2-d92b10474ce2",
+  "subMetas": {}
+}

frontend/assets/resources/animation/Monk/Atk3.anim

@@ -3,7 +3,7 @@
   "_name": "Atk3",
   "_objFlags": 0,
   "_native": "",
-  "_duration": 0.6333333333333333,
+  "_duration": 0.5333333333333333,
   "sample": 60,
   "speed": 1,
   "wrapMode": 1,
@@ -13,84 +13,72 @@
         "spriteFrame": [
           {
             "frame": 0,
-            "value": {
-              "__uuid__": "318745eb-06b1-4e7f-88d1-e23e02d99e67"
-            }
-          },
-          {
-            "frame": 0.06666666666666667,
-            "value": {
-              "__uuid__": "a64b6f59-fa72-4f5d-89dc-81a469244ea5"
-            }
-          },
-          {
-            "frame": 0.11666666666666667,
-            "value": {
-              "__uuid__": "f800d4a1-2396-4aa5-a578-11481db1d8bf"
-            }
-          },
-          {
-            "frame": 0.16666666666666666,
             "value": {
               "__uuid__": "d97f6a5f-8e63-40d7-bd14-9dc71e15e5db"
             }
           },
           {
-            "frame": 0.23333333333333334,
+            "frame": 0.03333333333333333,
             "value": {
               "__uuid__": "196bcbf9-e89f-4b26-b736-73e2fa787e50"
             }
           },
           {
-            "frame": 0.3,
+            "frame": 0.08333333333333333,
             "value": {
               "__uuid__": "3229e023-e63d-4a4e-af72-2b1409ea43c5"
             }
           },
           {
-            "frame": 0.36666666666666664,
+            "frame": 0.11666666666666667,
             "value": {
               "__uuid__": "e2d6e8b8-b468-4edb-b8c3-860bd85ebeae"
             }
           },
           {
-            "frame": 0.4166666666666667,
+            "frame": 0.16666666666666666,
+            "value": {
+              "__uuid__": "318745eb-06b1-4e7f-88d1-e23e02d99e67"
+            }
+          },
+          {
+            "frame": 0.21666666666666667,
             "value": {
               "__uuid__": "bba6f088-0e1f-4a12-9872-41670be1152a"
             }
           },
           {
-            "frame": 0.45,
+            "frame": 0.26666666666666666,
             "value": {
               "__uuid__": "2c5de5b2-9009-48fa-bef4-ae34cc94f876"
             }
           },
           {
-            "frame": 0.48333333333333334,
+            "frame": 0.31666666666666665,
             "value": {
               "__uuid__": "6f27b252-6eaf-4b4b-9c5a-46ba899e4845"
             }
           },
           {
-            "frame": 0.5166666666666667,
+            "frame": 0.36666666666666664,
             "value": {
               "__uuid__": "4ebd5c60-efa6-4950-a4c8-74a7a8517333"
             }
           },
           {
-            "frame": 0.55,
+            "frame": 0.4166666666666667,
             "value": {
               "__uuid__": "a207290f-4556-4adb-8a11-e1d5ba342550"
             }
           },
           {
-            "frame": 0.5833333333333334,
+            "frame": 0.4666666666666667,
             "value": {
               "__uuid__": "e9d442d2-981d-437d-87c0-085162017de7"
             }
           },
           {
-            "frame": 0.6166666666666667,
+            "frame": 0.5166666666666667,
             "value": {
               "__uuid__": "9b4d5c8c-5ec0-4fd7-a45e-6b0bc8ff9119"
             }

frontend/assets/resources/animation/Monk/Atk5.anim

@@ -0,0 +1,85 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "Atk5",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 1.0166666666666666,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "6aa88bb9-0427-496f-ae7d-dc06410e904e"
+            }
+          },
+          {
+            "frame": 0.08333333333333333,
+            "value": {
+              "__uuid__": "cdc65f83-c526-48b6-8a96-758b098568fe"
+            }
+          },
+          {
+            "frame": 0.16666666666666666,
+            "value": {
+              "__uuid__": "927636af-2d1d-4801-a546-857f5eeb256d"
+            }
+          },
+          {
+            "frame": 0.26666666666666666,
+            "value": {
+              "__uuid__": "2aeeb833-9151-4160-9775-9e08a376fd63"
+            }
+          },
+          {
+            "frame": 0.36666666666666664,
+            "value": {
+              "__uuid__": "2bd1de9e-30e5-4bc5-b6c3-5c286754b0b7"
+            }
+          },
+          {
+            "frame": 0.4666666666666667,
+            "value": {
+              "__uuid__": "15a6ebb3-289a-46fb-ac94-f6efa0d90510"
+            }
+          },
+          {
+            "frame": 0.5833333333333334,
+            "value": {
+              "__uuid__": "6ca922c0-cb62-4b1b-8773-79685a58bbd6"
+            }
+          },
+          {
+            "frame": 0.7,
+            "value": {
+              "__uuid__": "d60ceb6f-3a45-47dd-8d3f-bcfe8c919d85"
+            }
+          },
+          {
+            "frame": 0.8,
+            "value": {
+              "__uuid__": "c313f6a1-e0fa-4321-8336-c32f471b2592"
+            }
+          },
+          {
+            "frame": 0.9,
+            "value": {
+              "__uuid__": "bb886d03-7f3e-45c8-acfd-393091f09adb"
+            }
+          },
+          {
+            "frame": 1,
+            "value": {
+              "__uuid__": "1be255c3-f8c9-43ae-be68-2e500e7f1125"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

frontend/assets/resources/animation/Monk/Atk5.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "0abbd156-980e-475e-9994-3c958bd913fc",
+  "subMetas": {}
+}

frontend/assets/resources/animation/Monk/InAirIdle1ByJump.anim

@@ -3,7 +3,7 @@
   "_name": "InAirIdle1ByJump",
   "_objFlags": 0,
   "_native": "",
-  "_duration": 0.7833333333333333,
+  "_duration": 0.5833333333333334,
   "sample": 60,
   "speed": 1,
   "wrapMode": 1,
@@ -18,67 +18,67 @@
             }
           },
           {
-            "frame": 0.05,
+            "frame": 0.03333333333333333,
             "value": {
               "__uuid__": "06d18871-0cb6-41eb-a484-5c6a4c04d5d5"
             }
           },
           {
-            "frame": 0.11666666666666667,
+            "frame": 0.06666666666666667,
             "value": {
               "__uuid__": "f298ff82-ad9d-4945-ab19-14c3e3d54c95"
             }
           },
           {
-            "frame": 0.18333333333333332,
+            "frame": 0.11666666666666667,
             "value": {
               "__uuid__": "bb5924a6-40cf-4e43-8c94-e51b27861656"
             }
           },
           {
-            "frame": 0.25,
+            "frame": 0.16666666666666666,
             "value": {
               "__uuid__": "fc4b5181-77af-44ec-836e-c14eec8d20c4"
             }
           },
           {
-            "frame": 0.3333333333333333,
+            "frame": 0.21666666666666667,
             "value": {
               "__uuid__": "5ddd3db3-79b2-4f0c-bb76-2446801ff665"
             }
           },
           {
-            "frame": 0.4166666666666667,
+            "frame": 0.26666666666666666,
             "value": {
               "__uuid__": "032785ce-c911-479b-be1c-2e0899a586d0"
             }
           },
           {
-            "frame": 0.48333333333333334,
+            "frame": 0.31666666666666665,
             "value": {
               "__uuid__": "d651269d-1c08-49f8-bc38-d301bf26b0e1"
             }
           },
           {
-            "frame": 0.5666666666666667,
+            "frame": 0.36666666666666664,
             "value": {
               "__uuid__": "e270563e-d98d-4a80-82db-837183053ae3"
             }
           },
           {
-            "frame": 0.6333333333333333,
+            "frame": 0.43333333333333335,
             "value": {
               "__uuid__": "aec31ef8-46dc-4f0e-9cba-18f6c96c5c33"
             }
           },
           {
-            "frame": 0.7,
+            "frame": 0.5,
             "value": {
               "__uuid__": "e64b3a8d-41a9-45f6-9aeb-9e49b6317080"
             }
           },
           {
-            "frame": 0.7666666666666667,
+            "frame": 0.5666666666666667,
             "value": {
               "__uuid__": "cf886091-24a9-4cfb-8cb9-e3db977035ab"
             }

frontend/assets/resources/map/dungeon/map.tmx

@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="128" height="128" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="113">
+<map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="128" height="64" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="135">
  <tileset firstgid="1" source="tiles0.tsx"/>
  <tileset firstgid="65" source="tiles1.tsx"/>
  <tileset firstgid="129" source="tiles2.tsx"/>
- <layer id="2" name="Ground" width="128" height="128">
+ <layer id="6" name="Ground" width="128" height="64">
   <data encoding="base64" compression="zlib">
-   eJzt3LFu00AcwOEoFUuHigqBBANTByRegrlTWWBj6gsgWGBCqngAFgZ23hNHsiXj5mLncs6dfd/wSVUbWa1/f199VpSLzWZzAQAAAAAAAAAAAAAAAAAAES5buX8Pzue+p+t/X6HcHXL237a6/p8atwHbFdL///4h+q9Pv//tSP/LAlrpP1//ffRft93f/ry179wM14TcrfQ/b/8a6K9/7g45+z+LkLuZ/nn7r2kG9Nc/d4cl9i+J/nX2d/3X3T/FDOi/XK5//fWvt3+KGdA//bntnik+nGjua19//fVfRv+XLf3r6d/v3f9af/31z9f/6YiU/fv0z9t/rPu+/r8bH47U9Xf/V07/qe3vNu7/l2Jq/6ntt/ovylj/fY3fNq4C7Yf9h+6OpH++/vvaX/UMu8/R/0XjRv9i+h9a9/v9U9O/3P4x94jH0v/8/afMwPBcpuw7JmX/bQEtSuyf6hwfEtNe//X0P2ZG5ji2/qfPwN9ELVIdR/90/afMgP7LpL/+JXXL1T93B/31X3L/Xwnpv7z+S6Z/3fSvm/51079u+tdN/7rpXzf966Z/3fSvm/51079u+pfrJkD/MvrP9X7RUPc55kD/cvpfj3gSoP86+uegf3xv/Zet9Ps//dfXP/S/vfv5+4T6xwytT97/Pe5ja7jed9/PfQ2fev3rf9ih//nD/q8LaBqyb43QP2zXMrTn2hnbr12PHD93+65/7g6l9u86vznBqfvzOdvr/3i9Tr1+p3hGM1d7/dM/Twv1zzEDU/YItfefu8Fwts71nGjqHlH/8/bvZmDOz3s55hmB/o+lvJ8/tH8I+REhpr3+4/1OnYOY/jEz8DOS/tPEzsGrTVz/3WcBfA207nxvfG5fq/+8/WM1/d/F9t/5sgn3/9Z73a7ln5b+0/uTvwMAAAAAAAAAAAAAAABwfv8AQJoGWw==
+   eJzt2ztuAjEURmELlIYuiKRHyk4iGjo2wP6XkRDGUmThxwx3fC3+U3wNw8v3eEyabEMIWwAAAAAAAAAAAADo4IQ/3h08+3t/B2/KM1BeOzPQXjsz0F47M6iv/c3oc6zeh/7+/Q+NHr1P6z7YGz2H/svWXur1TP/SvqL/OP1LnSz6t7Qt9a1dp//4/VvOgJJeM3hlLf2tzNljI83glY2+9vcMpRko9E/PgFz3NfbBKDNQ7r+kvdU+GHEGHv2/Gl9zNHrOKOh/t5vQX8dt7d+JeC19PDo2yr1+NHEG3i28+m8m8f6//jpnbAzkfsNr15eqfR/1+z/tfxP/Fvj/mFX/0dD/7pz0fsR69p8rmHv20D9vl5mZ1flb67VkP81pT/8QPialmT1z/5f2QK/7v7Q/6Z/vb6F0DvToXzuf1PvDv4Nn/4s4+mujvzb6a6O/Nvpro782+mujvzb6a6O/Nvpro782+mujvzb6a6O/Nvpro782+mujvzb6a6O/tvg/UN4t6E9/+tO/d3+s1/8HUhSy6A==
   </data>
  </layer>
  <objectgroup id="1" name="PlayerStartingPos">
-  <object id="135" x="1040.33" y="1081">
+  <object id="135" x="840" y="530">
    <point/>
   </object>
-  <object id="137" x="1134.67" y="1081.67">
+  <object id="137" x="959" y="532">
    <point/>
   </object>
  </objectgroup>
  <objectgroup id="4" name="NpcStartingPos">
-  <object id="108" x="926" y="1447">
+  <object id="108" x="927.333" y="535">
    <properties>
     <property name="dirX" value="-2"/>
     <property name="speciesId" value="4196"/>
@@ -26,28 +26,28 @@
   </object>
  </objectgroup>
  <objectgroup id="5" name="NpcPatrolCue">
-  <object id="109" x="773.337" y="1468.67">
+  <object id="109" x="774.67" y="556.67">
    <properties>
     <property name="flAct" value="36"/>
     <property name="frAct" value="35"/>
    </properties>
    <point/>
   </object>
-  <object id="110" x="728" y="1500">
+  <object id="110" x="729.333" y="588">
    <properties>
     <property name="flAct" value="4"/>
     <property name="frAct" value="35"/>
    </properties>
    <point/>
   </object>
-  <object id="111" x="668" y="1500">
+  <object id="111" x="669.333" y="588">
    <properties>
     <property name="flAct" value="3"/>
     <property name="frAct" value="3"/>
    </properties>
    <point/>
   </object>
-  <object id="112" x="984" y="1447">
+  <object id="112" x="985.333" y="535">
    <properties>
     <property name="flAct" value="4"/>
     <property name="frAct" value="4"/>
@@ -59,197 +59,147 @@
   <properties>
    <property name="type" value="barrier_and_shelter"/>
   </properties>
-  <object id="54" x="656" y="1504" width="80" height="16">
+  <object id="57" x="768" y="560" width="32" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="55" x="736" y="1552" width="112" height="16">
+  <object id="60" x="1232" y="432" width="208" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="57" x="768" y="1472" width="32" height="16">
+  <object id="65" x="1040" y="576" width="32" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="58" x="1040" y="1536" width="80" height="16">
+  <object id="66" x="1040" y="560" width="16" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="59" x="1040" y="1568" width="224" height="48">
+  <object id="67" x="784" y="544" width="256" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="60" x="1216" y="1344" width="224" height="16">
+  <object id="84" x="640" y="224" width="16" height="800">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="62" x="1040" y="1552" width="208" height="16">
+  <object id="85" x="1680" y="224" width="16" height="800">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="63" x="1040" y="1504" width="48" height="16">
+  <object id="86" x="1104" y="496" width="96" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="64" x="1040" y="1520" width="64" height="16">
+  <object id="90" x="1232" y="496" width="320" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="65" x="1040" y="1488" width="32" height="16">
+  <object id="97" x="1248" y="416" width="158" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="66" x="1040" y="1472" width="16" height="16">
+  <object id="98" x="1280" y="400" width="96" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="67" x="784" y="1456" width="256" height="16">
+  <object id="100" x="1552" y="576" width="128" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="73" x="784" y="1568" width="96" height="16">
+  <object id="101" x="1568" y="560" width="112" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="74" x="816" y="1584" width="96" height="16">
+  <object id="102" x="1584" y="544" width="96" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="79" x="640" y="1616" width="1056" height="16">
+  <object id="103" x="1600" y="528" width="80" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="83" x="640" y="480" width="1056" height="16">
+  <object id="104" x="768" y="382" width="304" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="84" x="640" y="480" width="16" height="1152">
+  <object id="105" x="768" y="302" width="16" height="96">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="85" x="1680" y="480" width="16" height="1152">
+  <object id="106" x="1056" y="302" width="16" height="96">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="86" x="1104" y="1408" width="96" height="16">
+  <object id="113" x="640" y="1008" width="1056" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="87" x="1456" y="1568" width="224" height="48">
+  <object id="114" x="640" y="224" width="1056" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="88" x="1264" y="1584" width="16" height="32">
+  <object id="119" x="656" y="592" width="1024" height="416">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="89" x="1280" y="1600" width="16" height="16">
+  <object id="120" x="736" y="512" width="16" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="90" x="1232" y="1408" width="304" height="16">
+  <object id="121" x="736" y="336" width="16" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="91" x="1440" y="1584" width="16" height="32">
+  <object id="125" x="688" y="448" width="16" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="92" x="1424" y="1600" width="16" height="16">
+  <object id="127" x="1088" y="320" width="16" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="93" x="1488" y="1552" width="192" height="16">
+  <object id="128" x="1120" y="336" width="16" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="94" x="1504" y="1536" width="176" height="16">
+  <object id="129" x="1136" y="368" width="16" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="95" x="1520" y="1520" width="160" height="16">
+  <object id="130" x="1168" y="384" width="16" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="96" x="1568" y="1408" width="16" height="16">
+  <object id="132" x="1184" y="416" width="16" height="16">
-   <properties>
-    <property name="boundary_type" value="barrier"/>
-   </properties>
-  </object>
-  <object id="97" x="1248" y="1328" width="158" height="16">
-   <properties>
-    <property name="boundary_type" value="barrier"/>
-   </properties>
-  </object>
-  <object id="98" x="1280" y="1312" width="96" height="16">
-   <properties>
-    <property name="boundary_type" value="barrier"/>
-   </properties>
-  </object>
-  <object id="99" x="1536" y="1504" width="144" height="16">
-   <properties>
-    <property name="boundary_type" value="barrier"/>
-   </properties>
-  </object>
-  <object id="100" x="1552" y="1488" width="128" height="16">
-   <properties>
-    <property name="boundary_type" value="barrier"/>
-   </properties>
-  </object>
-  <object id="101" x="1568" y="1472" width="112" height="16">
-   <properties>
-    <property name="boundary_type" value="barrier"/>
-   </properties>
-  </object>
-  <object id="102" x="1584" y="1456" width="96" height="16">
-   <properties>
-    <property name="boundary_type" value="barrier"/>
-   </properties>
-  </object>
-  <object id="103" x="1600" y="1440" width="80" height="16">
-   <properties>
-    <property name="boundary_type" value="barrier"/>
-   </properties>
-  </object>
-  <object id="104" x="928" y="1088" width="304" height="16">
-   <properties>
-    <property name="boundary_type" value="barrier"/>
-   </properties>
-  </object>
-  <object id="105" x="928" y="1008" width="16" height="96">
-   <properties>
-    <property name="boundary_type" value="barrier"/>
-   </properties>
-  </object>
-  <object id="106" x="1216" y="1008" width="16" height="96">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>

frontend/assets/resources/pbfiles/room_downsync_frame.proto

@@ -32,6 +32,10 @@ message PlayerDownsync {
   int32 bulletTeamId = 24;
   int32 chCollisionTeamId = 25;
 
+  bool onWall = 26; // like "inAir", it’s by design a standalone field only inferred by the collision result of "applyInputFrameDownsyncDynamicsOnSingleRenderFrame" instead of "characterState", because we need check the transition for "characterState" from this field, i.e. "onWall (prev -> curr)"
+  int32 onWallNormX = 27;
+  int32 onWallNormY = 28;
+
   string name = 997;
   string displayName = 998;
   string avatar = 999;
@@ -117,6 +121,11 @@ message MeleeBullet {
   int32 teamId = 19;
 
   int32 bulletLocalId = 20;
+  int32 speciesId = 21;
+  int32 explosionFrames = 22;
+
+  int32 blState = 23;
+  int32 framesInBlState = 24;
 }
 
 message FireballBullet {
@@ -146,6 +155,11 @@ message FireballBullet {
   int32 teamId = 19;
 
   int32 bulletLocalId = 20;
+  int32 speciesId = 21;
+  int32 explosionFrames = 22;
+
+  int32 blState = 23;
+  int32 framesInBlState = 24;
 
   int32 virtualGridX = 999;
   int32 virtualGridY = 1000;
@@ -159,10 +173,10 @@ message FireballBullet {
 message BattleColliderInfo {
   string stageName = 1;
 
-  int32 intervalToPing        = 2;
+  int32 intervalToPing = 2;
   int32 willKickIfInactiveFor = 3;
-  int32 boundRoomId           = 4;
+  int32 boundRoomId = 4;
-  int64 battleDurationNanos   = 5;
+  int64 battleDurationNanos = 5;
   int32 inputFrameUpsyncDelayTolerance = 6;
   int32 maxChasingRenderFramesPerUpdate = 7;
   double rollbackEstimatedDtMillis = 8;

frontend/assets/resources/prefabs/ControlledCharacter.prefab

@@ -31,13 +31,10 @@
     "_components": [
       {
         "__id__": 22
-      },
-      {
-        "__id__": 23
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 23
     },
     "_opacity": 255,
     "_color": {
@@ -648,6 +645,14 @@
       },
       {
         "__uuid__": "9b500cb0-8048-4715-81db-cc975c914225"
+      },
+      null,
+      null,
+      {
+        "__uuid__": "38b2c892-347b-4009-93f8-65b2ab1614f0"
+      },
+      {
+        "__uuid__": "411f964a-4dd8-424c-b2e2-d92b10474ce2"
       }
     ],
     "playOnLoad": false,
@@ -814,6 +819,9 @@
       },
       {
         "__uuid__": "7e0a1e98-ee5a-446f-bec2-7d72b6916503"
+      },
+      {
+        "__uuid__": "0abbd156-980e-475e-9994-3c958bd913fc"
       }
     ],
     "playOnLoad": false,
@@ -869,32 +877,6 @@
     "fileId": "7aN7Gcc/tBw5EGlTJVBj2+",
     "sync": false
   },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "_materials": [],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": null,
-    "_type": 0,
-    "_sizeMode": 0,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
-    "_id": ""
-  },
   {
     "__type__": "b74b05YDqZFRo4OkZRFZX8k",
     "_name": "",

frontend/assets/resources/prefabs/Fireball.prefab

@@ -0,0 +1,443 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Root",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 12
+      }
+    ],
+    "_prefab": {
+      "__id__": 13
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 120,
+      "height": 120
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 2,
+    "groupIndex": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "animNode",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 7
+      }
+    ],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 11
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Fireball1",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 4
+      },
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 6
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 117,
+      "height": 55
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -32,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": null,
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": {
+      "__uuid__": "6dcd5722-8ef9-47fd-9520-861d2713e274"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "_defaultClip": {
+      "__uuid__": "ba12416b-eec3-4260-8402-7fc25b125624"
+    },
+    "_clips": [
+      {
+        "__uuid__": "ba12416b-eec3-4260-8402-7fc25b125624"
+      },
+      {
+        "__uuid__": "7941215a-2b8c-4798-954b-4f1b16d5f6f5"
+      }
+    ],
+    "playOnLoad": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "d92d4831-cd65-4eb5-90bd-b77021aec35b"
+    },
+    "fileId": "5f1s6pDt5F3rknJTu0gQW7",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "MeleeExplosion",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 9
+      }
+    ],
+    "_prefab": {
+      "__id__": 10
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        24,
+        8,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 7
+    },
+    "_enabled": true,
+    "_defaultClip": null,
+    "_clips": [
+      {
+        "__uuid__": "954a2924-89df-4df4-93fc-36d2b22e7619"
+      },
+      {
+        "__uuid__": "5bd304eb-c8ba-426f-a9ab-5698ac62de85"
+      },
+      {
+        "__uuid__": "5054633c-a588-4506-b4ac-eef29b1d8511"
+      }
+    ],
+    "playOnLoad": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 7
+    },
+    "_enabled": true,
+    "_materials": [],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": null,
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": {
+      "__uuid__": "1c4c1dcb-54af-485b-9119-abd6d6d84526"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "d92d4831-cd65-4eb5-90bd-b77021aec35b"
+    },
+    "fileId": "fd9jQiClRJSI00917fifB8",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "d92d4831-cd65-4eb5-90bd-b77021aec35b"
+    },
+    "fileId": "3824oBeVVL1KOAQ6Zd9CC5",
+    "sync": false
+  },
+  {
+    "__type__": "e66a2qRmRZGnqSyVMwLy6Pw",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "animNode": {
+      "__id__": 2
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "d92d4831-cd65-4eb5-90bd-b77021aec35b"
+    },
+    "fileId": "4cx75uwJJFa7U8QL187QCL",
+    "sync": false
+  }
+]

frontend/assets/resources/prefabs/Fireball.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.5",
+  "uuid": "d92d4831-cd65-4eb5-90bd-b77021aec35b",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

frontend/assets/scenes/default_map.fire

@@ -191,8 +191,8 @@
         0,
         0,
         1,
-        1.5,
+        1.2,
-        1.5,
+        1.2,
         1
       ]
     },
@@ -234,6 +234,9 @@
     "controlledCharacterPrefab": {
       "__uuid__": "59bff7a2-23e1-4d69-bce7-afb37eae196a"
     },
+    "fireballPrefab": {
+      "__uuid__": "d92d4831-cd65-4eb5-90bd-b77021aec35b"
+    },
     "joystickInputControllerNode": {
       "__id__": 6
     },
@@ -268,6 +271,7 @@
     "renderFrameIdLagTolerance": 4,
     "jigglingEps1D": 0.001,
     "bulletTriggerEnabled": true,
+    "closeOnForcedtoResyncNotSelf": true,
     "_id": "d12gkAmppNlIzqcRDELa91"
   },
   {
@@ -453,7 +457,7 @@
       "array": [
         0,
         0,
-        215.81269742929726,
+        209.57814771583418,
         0,
         0,
         0,

frontend/assets/scenes/login.fire

@@ -440,7 +440,7 @@
       "array": [
         0,
         0,
-        210.3490857485811,
+        216.50635094610968,
         0,
         0,
         0,

frontend/assets/scenes/offline_map.fire

@@ -191,8 +191,8 @@
         0,
         0,
         1,
-        1.5,
+        1.2,
-        1.5,
+        1.2,
         1
       ]
     },
@@ -262,6 +262,9 @@
     "controlledCharacterPrefab": {
       "__uuid__": "59bff7a2-23e1-4d69-bce7-afb37eae196a"
     },
+    "fireballPrefab": {
+      "__uuid__": "d92d4831-cd65-4eb5-90bd-b77021aec35b"
+    },
     "joystickInputControllerNode": {
       "__id__": 7
     },
@@ -461,7 +464,7 @@
       "array": [
         0,
         0,
-        215.64032554232523,
+        216.50635094610968,
         0,
         0,
         0,

frontend/assets/scripts/AttackingCharacter.js

@@ -12,9 +12,12 @@ window.ATK_CHARACTER_STATE = {
   BlownUp1: [8, "BlownUp1"],
   LayDown1: [9, "LayDown1"], // The last frame of "LayDown1" should have a simliar boundingbox with the first frame of "GetUp1", otherwise the animation would seem odd
   GetUp1: [10, "GetUp1"],
-  Atk2:   [11, "Atk2"],
+  Atk2: [11, "Atk2"],
-  Atk3:   [12, "Atk3"],
+  Atk3: [12, "Atk3"],
-  Atk4:   [13, "Atk4"],
+  Atk4: [13, "Atk4"],
+  Atk5: [14, "Atk5"],
+  Dashing: [15, "Dashing"],
+  OnWall: [16, "OnWall"],
 };
 
 window.ATK_CHARACTER_STATE_ARR = [];
@@ -30,6 +33,8 @@ window.ATK_CHARACTER_STATE_INTERRUPT_WAIVE_SET.add(window.ATK_CHARACTER_STATE.In
 window.ATK_CHARACTER_STATE_INTERRUPT_WAIVE_SET.add(window.ATK_CHARACTER_STATE.BlownUp1[0]);
 window.ATK_CHARACTER_STATE_INTERRUPT_WAIVE_SET.add(window.ATK_CHARACTER_STATE.LayDown1[0]);
 window.ATK_CHARACTER_STATE_INTERRUPT_WAIVE_SET.add(window.ATK_CHARACTER_STATE.GetUp1[0]);
+window.ATK_CHARACTER_STATE_INTERRUPT_WAIVE_SET.add(window.ATK_CHARACTER_STATE.Dashing[0]);
+window.ATK_CHARACTER_STATE_INTERRUPT_WAIVE_SET.add(window.ATK_CHARACTER_STATE.OnWall[0]);
 
 window.ATK_CHARACTER_STATE_IN_AIR_SET = new Set();
 window.ATK_CHARACTER_STATE_IN_AIR_SET.add(window.ATK_CHARACTER_STATE.InAirIdle1NoJump[0]);
@@ -37,6 +42,7 @@ window.ATK_CHARACTER_STATE_IN_AIR_SET.add(window.ATK_CHARACTER_STATE.InAirIdle1B
 window.ATK_CHARACTER_STATE_IN_AIR_SET.add(window.ATK_CHARACTER_STATE.InAirAtk1[0]);
 window.ATK_CHARACTER_STATE_IN_AIR_SET.add(window.ATK_CHARACTER_STATE.InAirAtked1[0]);
 window.ATK_CHARACTER_STATE_IN_AIR_SET.add(window.ATK_CHARACTER_STATE.BlownUp1[0]);
+window.ATK_CHARACTER_STATE_IN_AIR_SET.add(window.ATK_CHARACTER_STATE.OnWall[0]);
 
 /*
 Kindly note that the use of dragonBones anim is an informed choice for the feasibility of "gotoAndPlayByFrame", which is a required feature by "Map.rollbackAndChase". You might find that "cc.Animation" -- the traditional frame anim -- can also suffice this requirement, yet if we want to develop 3D frontend in the future, working with skeletal anim will make a smoother transition.
@@ -78,16 +84,24 @@ cc.Class({
   updateCharacterAnim(rdfPlayer, prevRdfPlayer, forceAnimSwitch, chConfig) {
     // As this function might be called after many frames of a rollback, it's possible that the playing animation was predicted, different from "prevRdfPlayer.CharacterState" but same as "newCharacterState". More granular checks are needed to determine whether we should interrupt the playing animation.  
 
+    let newCharacterState = rdfPlayer.CharacterState;
+
     // Update directions
     if (this.animComp && this.animComp.node) {
       if (0 > rdfPlayer.DirX) {
         this.animNode.scaleX = (-1.0);
       } else if (0 < rdfPlayer.DirX) {
-        this.animNode.scaleX = (1.0);
+        this.animNode.scaleX = (+1.0);
+      }
+      if (ATK_CHARACTER_STATE.OnWall[0] == newCharacterState) {
+        if (0 < rdfPlayer.OnWallNormX) {
+          this.animNode.scaleX = (-1.0);
+        } else {
+          this.animNode.scaleX = (+1.0);
+        }
       }
     }
 
-    let newCharacterState = rdfPlayer.CharacterState;
     let newAnimName = window.ATK_CHARACTER_STATE_ARR[newCharacterState][1];
     let playingAnimName = null;
     let underlyingAnimationCtrl = null;

frontend/assets/scripts/Bullet.js

@@ -0,0 +1,36 @@
+window.BULLET_STATE = {
+  Startup: 0,
+  Active: 1,
+  Exploding: 2,
+};
+
+cc.Class({
+  extends: cc.Component,
+
+  properties: {
+    animNode: {
+      type: cc.Node,
+      default: null
+    },
+  },
+
+  updateAnim(newAnimName, frameIdxInAnim, dirX, spontaneousLooping, rdf, newAnimIdx) {
+    this.animComp = this.effAnimNode.getComponent(cc.Animation);
+    // Update directions
+    if (this.animComp && this.animComp.node) {
+      if (0 > dirX) {
+        this.animNode.scaleX = (-1.0);
+      } else if (0 < dirX) {
+        this.animNode.scaleX = (1.0);
+      }
+    }
+
+    const currentClip = this.animComp.currentClip;
+    if (true == spontaneousLooping && (null != currentClip && currentClip.name == newAnimName)) {
+      return;
+    }
+    const targetClip = this.animComp.getClips()[newAnimIdx]; 
+    let fromTime = (frameIdxInAnim / targetClip.sample); // TODO: Anyway to avoid using division here?
+    this.animComp.play(newAnimName, fromTime);
+  },
+});

frontend/assets/scripts/Bullet.js.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.5",
-  "uuid": "247b7613-6c6e-4f01-b1d6-5f8f041b5688",
+  "uuid": "a4b909c4-56a8-4b70-b6ea-b7f928077747",
   "isPlugin": false,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

frontend/assets/scripts/CameraTracker.js

@@ -1,37 +1,34 @@
 cc.Class({
-    extends: cc.Component,
+  extends: cc.Component,
 
-    properties: {
+  properties: {
-      mapNode: {
+    mapNode: {
-        type: cc.Node,
+      type: cc.Node,
-        default: null
+      default: null
-      },
-      speed: {
-        type: cc.Float,
-        default: 500
-      }, 
     },
-
+    speed: {
-    onLoad () {
+      type: cc.Float,
-      this.mainCamera = this.mapNode.parent.getChildByName("Main Camera").getComponent(cc.Camera);
+      default: 500
-      this.mapScriptIns = this.mapNode.getComponent("Map");
     },
+  },
 
-    start() {},
+  onLoad() {
+    this.mainCamera = this.mapNode.parent.getChildByName("Main Camera").getComponent(cc.Camera);
+    this.mapScriptIns = this.mapNode.getComponent("Map");
+  },
 
-    update(dt) {
+  start() {},
-      const self = this;
+
-      if (!self.mainCamera) return;
+  update(dt) {
-      if (!self.mapScriptIns) return;
+    const self = this;
-      if (!self.mapScriptIns.selfPlayerInfo) return;
+    if (!self.mainCamera) return;
-      if (!self.mapScriptIns.playerRichInfoDict) return;
+    if (!self.mapScriptIns) return;
-      const selfPlayerRichInfo = self.mapScriptIns.playerRichInfoDict.get(self.mapScriptIns.selfPlayerInfo.Id);
+    if (!self.mapScriptIns.selfPlayerInfo) return;
-      if (!selfPlayerRichInfo) return;
+    if (!self.mapScriptIns.playerRichInfoDict) return;
-      const selfPlayerNode = selfPlayerRichInfo.node; 
+    const selfPlayerRichInfo = self.mapScriptIns.playerRichInfoDict.get(self.mapScriptIns.selfPlayerInfo.Id);
-      if (!selfPlayerNode) return;
+    if (!selfPlayerRichInfo) return;
-      const pDiff = selfPlayerNode.position.sub(self.mainCamera.node.position); 
+    const selfPlayerNode = selfPlayerRichInfo.node;
-      pDiff.normalizeSelf();
+    if (!selfPlayerNode) return;
-      const newCamPos = self.mainCamera.node.position.add(pDiff.mul(dt*self.speed));
+    self.mapNode.setPosition(cc.v2().sub(selfPlayerNode.position));
-      self.mainCamera.node.setPosition(newCamPos);
+  }
-    }
 });

frontend/assets/scripts/Fireball.js

@@ -0,0 +1,29 @@
+const Bullet = require("./Bullet");
+
+cc.Class({
+  extends: Bullet,
+
+  ctor() {
+    this.lastUsed = -1;
+    this.bulletLocalId = -1;
+    this.speciesName = null;
+  },
+
+  setSpecies(speciesName, fireballBullet, rdf) {
+    if (speciesName == this.speciesName) return;
+    if (null != this.speciesName) {
+      for (let k in this.animNode.children) {
+        const child = this.children[k];
+        if (!child.active) continue;
+        if (child == effAnimNode || child.name == speciesName) continue;
+        child.active = false;
+      }
+    }
+    this.speciesName = speciesName;
+    this.effAnimNode = this.animNode.getChildByName(this.speciesName);
+    this.effAnimNode.active = true;
+  },
+
+  onLoad() {},
+
+});

frontend/assets/scripts/Fireball.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.5",
+  "uuid": "e66a2a91-9916-469e-a4b2-54cc0bcba3f0",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

frontend/assets/scripts/Map.js

@@ -2,6 +2,7 @@ const i18n = require('LanguageData');
 i18n.init(window.language); // languageID should be equal to the one we input in New Language ID input field
 
 const RingBuffer = require('./RingBuffer');
+const PriorityQueue = require("./PriorityQueue");
 
 window.ALL_MAP_STATES = {
   VISUAL: 0, // For free dragging & zooming.
@@ -44,6 +45,10 @@ cc.Class({
       type: cc.Prefab,
       default: null,
     },
+    fireballPrefab: {
+      type: cc.Prefab,
+      default: null,
+    },
     joystickInputControllerNode: {
       type: cc.Node,
       default: null
@@ -129,7 +134,7 @@ cc.Class({
     previousSelfInput = (null == previousInputFrameDownsync ? null : previousInputFrameDownsync.InputList[joinIndex - 1]);
     if (null != existingInputFrame) {
       // This could happen upon either [type#1] or [type#2] forceConfirmation, where "refRenderFrame" is accompanied by some "inputFrameDownsyncs". The check here also guarantees that we don't override history 
-      console.log(`noDelayInputFrameId=${inputFrameId} already exists in recentInputCache: recentInputCache=${self._stringifyRecentInputCache(false)}`);
+      //console.log(`noDelayInputFrameId=${inputFrameId} already exists in recentInputCache: recentInputCache=${self._stringifyRecentInputCache(false)}`);
       return [previousSelfInput, existingInputFrame.InputList[joinIndex - 1]];
     }
 
@@ -147,6 +152,7 @@ cc.Class({
       prefabbedInputList[k] = (prefabbedInputList[k] & 15);
     }
     currSelfInput = self.ctrl.getEncodedInput(); // When "null == existingInputFrame", it'd be safe to say that the realtime "self.ctrl.getEncodedInput()" is for the requested "inputFrameId"
+    //console.log(`@rdf.Id=${self.renderFrameId}, currSelfInput=${currSelfInput}`);
     prefabbedInputList[(joinIndex - 1)] = currSelfInput;
     while (self.recentInputCache.EdFrameId <= inputFrameId) {
       // Fill the gap
@@ -287,6 +293,30 @@ cc.Class({
     self.playerRichInfoDict = new Map();
     // Clearing previous info of all players. [ENDS]
 
+    // Clearing cached fireball rendering nodes [BEGINS]
+    if (null != self.cachedFireballs) {
+      while (!self.cachedFireballs.isEmpty()) {
+        const v = self.cachedFireballs.pop();
+        if (v && v.node && v.node.parent) {
+          v.node.parent.removeChild(v.node);
+        }
+      }
+    } else {
+      self.cachedFireballs = new PriorityQueue();
+    }
+    for (let k = 0; k < 1000; k++) {
+      const newFireballNode = cc.instantiate(self.fireballPrefab);
+      const newFireball = newFireballNode.getComponent("Fireball");
+      newFireballNode.setPosition(cc.v2(Number.MAX_VALUE, Number.MAX_VALUE));
+      safelyAddChild(self.node, newFireballNode);
+      setLocalZOrder(newFireballNode, 5);
+      newFireball.lastUsed = -1;
+      newFireball.bulletLocalId = -1;
+      const initLookupKey = -(k + 1); // there's definitely no suck "bulletLocalId"
+      self.cachedFireballs.push(newFireball.lastUsed, newFireball, initLookupKey);
+    }
+    // Clearing cached fireball rendering nodes [ENDS]
+
     self.renderFrameId = 0; // After battle started
     self.bulletBattleLocalIdCounter = 0;
     self.lastAllConfirmedInputFrameId = -1;
@@ -384,7 +414,7 @@ cc.Class({
     window.mapIns = self;
     window.forceBigEndianFloatingNumDecoding = self.forceBigEndianFloatingNumDecoding;
 
-    self.showCriticalCoordinateLabels = true;
+    self.showCriticalCoordinateLabels = false;
 
     console.warn("+++++++ Map onLoad()");
 
@@ -578,19 +608,19 @@ cc.Class({
     const jsPlayersArr = new Array(pbRdf.playersArr.length).fill(null);
     for (let k = 0; k < pbRdf.playersArr.length; ++k) {
       const pbPlayer = pbRdf.playersArr[k];
-      const jsPlayer = gopkgs.NewPlayerDownsyncJs(pbPlayer.id, pbPlayer.virtualGridX, pbPlayer.virtualGridY, pbPlayer.dirX, pbPlayer.dirY, pbPlayer.velX, pbPlayer.velY, pbPlayer.framesToRecover, pbPlayer.framesInChState, pbPlayer.activeSkillId, pbPlayer.activeSkillHit, pbPlayer.framesInvinsible, pbPlayer.speed, pbPlayer.battleState, pbPlayer.characterState, pbPlayer.joinIndex, pbPlayer.hp, pbPlayer.maxHp, pbPlayer.colliderRadius, pbPlayer.inAir);
+      const jsPlayer = gopkgs.NewPlayerDownsyncJs(pbPlayer.id, pbPlayer.virtualGridX, pbPlayer.virtualGridY, pbPlayer.dirX, pbPlayer.dirY, pbPlayer.velX, pbPlayer.velY, pbPlayer.framesToRecover, pbPlayer.framesInChState, pbPlayer.activeSkillId, pbPlayer.activeSkillHit, pbPlayer.framesInvinsible, pbPlayer.speed, pbPlayer.battleState, pbPlayer.characterState, pbPlayer.joinIndex, pbPlayer.hp, pbPlayer.maxHp, pbPlayer.colliderRadius, pbPlayer.inAir, pbPlayer.onWall, pbPlayer.onWallNormX, pbPlayer.onWallNormY, pbPlayer.bulletTeamId, pbPlayer.chCollisionTeamId);
       jsPlayersArr[k] = jsPlayer;
     }
     const jsMeleeBulletsArr = new Array(pbRdf.meleeBullets.length).fill(null);
     for (let k = 0; k < pbRdf.meleeBullets.length; ++k) {
       const pbBullet = pbRdf.meleeBullets[k];
-      const jsMeleeBullet = gopkgs.NewMeleeBulletJs(pbBullet.bulletLocalId, pbBullet.originatedRenderFrameId, pbBullet.offenderJoinIndex, pbBullet.startupFrames, pbBullet.cancellableStFrame, pbBullet.cancellableEdFrame, pbBullet.activeFrames, pbBullet.hitStunFrames, pbBullet.blockStunFrames, pbBullet.pushbackVelX, pbBullet.pushbackVelY, pbBullet.damage, pbBullet.selfLockVelX, pbBullet.selfLockVelY, pbBullet.hitboxOffsetX, pbBullet.hitboxOffsetY, pbBullet.hitboxSizeX, pbBullet.hitboxSizeY, pbBullet.blowUp);
+      const jsMeleeBullet = gopkgs.NewMeleeBulletJs(pbBullet.bulletLocalId, pbBullet.originatedRenderFrameId, pbBullet.offenderJoinIndex, pbBullet.startupFrames, pbBullet.cancellableStFrame, pbBullet.cancellableEdFrame, pbBullet.activeFrames, pbBullet.hitStunFrames, pbBullet.blockStunFrames, pbBullet.pushbackVelX, pbBullet.pushbackVelY, pbBullet.damage, pbBullet.selfLockVelX, pbBullet.selfLockVelY, pbBullet.hitboxOffsetX, pbBullet.hitboxOffsetY, pbBullet.hitboxSizeX, pbBullet.hitboxSizeY, pbBullet.blowUp, pbBullet.teamId, pbBullet.blState, pbBullet.framesInBlState, pbBullet.explosionFrames, pbBullet.speciesId);
       jsMeleeBulletsArr[k] = jsMeleeBullet;
     }
     const jsFireballBulletsArr = new Array(pbRdf.fireballBullets.length).fill(null);
     for (let k = 0; k < pbRdf.fireballBullets.length; ++k) {
       const pbBullet = pbRdf.fireballBullets[k];
-      const jsFireballBullet = gopkgs.NewFireballBulletJs(pbBullet.bulletLocalId, pbBullet.originatedRenderFrameId, pbBullet.offenderJoinIndex, pbBullet.startupFrames, pbBullet.cancellableStFrame, pbBullet.cancellableEdFrame, pbBullet.activeFrames, pbBullet.hitStunFrames, pbBullet.blockStunFrames, pbBullet.pushbackVelX, pbBullet.pushbackVelY, pbBullet.damage, pbBullet.selfLockVelX, pbBullet.selfLockVelY, pbBullet.hitboxOffsetX, pbBullet.hitboxOffsetY, pbBullet.hitboxSizeX, pbBullet.hitboxSizeY, pbBullet.blowUp, pbBullet.teamId, pbBullet.virtualGridX, pbBullet.virtualGridY, pbBullet.dirX, pbBullet.dirY, pbBullet.velX, pbBullet.velY, pbBullet.speed);
+      const jsFireballBullet = gopkgs.NewFireballBulletJs(pbBullet.bulletLocalId, pbBullet.originatedRenderFrameId, pbBullet.offenderJoinIndex, pbBullet.startupFrames, pbBullet.cancellableStFrame, pbBullet.cancellableEdFrame, pbBullet.activeFrames, pbBullet.hitStunFrames, pbBullet.blockStunFrames, pbBullet.pushbackVelX, pbBullet.pushbackVelY, pbBullet.damage, pbBullet.selfLockVelX, pbBullet.selfLockVelY, pbBullet.hitboxOffsetX, pbBullet.hitboxOffsetY, pbBullet.hitboxSizeX, pbBullet.hitboxSizeY, pbBullet.blowUp, pbBullet.teamId, pbBullet.virtualGridX, pbBullet.virtualGridY, pbBullet.dirX, pbBullet.dirY, pbBullet.velX, pbBullet.velY, pbBullet.speed, pbBullet.blState, pbBullet.framesInBlState, pbBullet.explosionFrames, pbBullet.speciesId);
       jsFireballBulletsArr[k] = jsFireballBullet;
     }
 
@@ -691,6 +721,8 @@ cc.Class({
 
   equalPlayers(lhs, rhs) {
     if (null == lhs || null == rhs) return false;
+    if (null == lhs && null != rhs) return false;
+    if (null != lhs && null == rhs) return false;
     if (lhs.VirtualGridX != rhs.VirtualGridX) return false;
     if (lhs.VirtualGridY != rhs.VirtualGridY) return false;
     if (lhs.DirX != rhs.DirX) return false;
@@ -709,20 +741,43 @@ cc.Class({
 
   equalMeleeBullets(lhs, rhs) {
     if (null == lhs || null == rhs) return false;
-    if (lhs.battleLocalId != rhs.battleLocalId) return false;
+    if (null == lhs && null != rhs) return false;
-    if (lhs.offenderPlayerId != rhs.offenderPlayerId) return false;
+    if (null != lhs && null == rhs) return false;
-    if (lhs.offenderJoinIndex != rhs.offenderJoinIndex) return false;
+    if (lhs.BattleAttr.BulletLocalId != rhs.BattleAttr.BulletLocalId) return false;
-    if (lhs.originatedRenderFrameId != rhs.originatedRenderFrameId) return false;
+    if (lhs.BattleAttr.OffenderJoinIndex != rhs.BattleAttr.OffenderJoinIndex) return false;
+    if (lhs.BattleAttr.OriginatedRenderFrameId != rhs.BattleAttr.OriginatedRenderFrameId) return false;
+    return true;
+  },
+
+  equalFireballBullets(lhs, rhs) {
+    if (null == lhs || null == rhs) return false;
+    if (null == lhs && null != rhs) return false;
+    if (null != lhs && null == rhs) return false;
+    if (lhs.BattleAttr.BulletLocalId != rhs.BattleAttr.BulletLocalId) return false;
+    if (lhs.BattleAttr.OffenderJoinIndex != rhs.BattleAttr.OffenderJoinIndex) return false;
+    if (lhs.BattleAttr.OriginatedRenderFrameId != rhs.BattleAttr.OriginatedRenderFrameId) return false;
+
+    if (lhs.VirtualGridX != rhs.Bullet.VirtualGridX) return false;
+    if (lhs.VirtualGridY != rhs.Bullet.VirtualGridY) return false;
+    if (lhs.DirX != rhs.DirX) return false;
+    if (lhs.DirY != rhs.DirY) return false;
+    if (lhs.VelX != rhs.VelX) return false;
+    if (lhs.VelY != rhs.VelY) return false;
+    if (lhs.Speed != rhs.Speed) return false;
+
     return true;
   },
 
   equalRoomDownsyncFrames(lhs, rhs) {
     if (null == lhs || null == rhs) return false;
-    for (let k in lhs.players) {
+    for (let k in lhs.PlayersArr) {
-      if (!this.equalPlayers(lhs.players[k], rhs.players[k])) return false;
+      if (!this.equalPlayers(lhs.PlayersArr[k], rhs.PlayersArr[k])) return false;
     }
-    for (let k in lhs.meleeBullets) {
+    for (let k in lhs.MeleeBullets) {
-      if (!this.equalMeleeBullets(lhs.meleeBullets[k], rhs.meleeBullets[k])) return false;
+      if (!this.equalMeleeBullets(lhs.MeleeBullets[k], rhs.MeleeBullets[k])) return false;
+    }
+    for (let k in lhs.fireballBullet) {
+      if (!this.equalFireballBullets(lhs.FireballBullets[k], rhs.FireballBullets[k])) return false;
     }
     return true;
   },
@@ -862,9 +917,9 @@ batchInputFrameIdRange=[${batch[0].inputFrameId}, ${batch[batch.length - 1].inpu
       }
       try {
         let st = performance.now();
+        const noDelayInputFrameId = gopkgs.ConvertToNoDelayInputFrameId(self.renderFrameId);
         let prevSelfInput = null,
           currSelfInput = null;
-        const noDelayInputFrameId = gopkgs.ConvertToNoDelayInputFrameId(self.renderFrameId);
         if (gopkgs.ShouldGenerateInputFrameUpsync(self.renderFrameId)) {
           [prevSelfInput, currSelfInput] = self.getOrPrefabInputFrameUpsync(noDelayInputFrameId);
         }
@@ -899,17 +954,17 @@ batchInputFrameIdRange=[${batch[0].inputFrameId}, ${batch[batch.length - 1].inpu
         }  
         */
         // [WARNING] Don't try to get "prevRdf(i.e. renderFrameId == latest-1)" by "self.recentRenderCache.getByFrameId(...)" here, as the cache might have been updated by asynchronous "onRoomDownsyncFrame(...)" calls!
-        if (self.othersForcedDownsyncRenderFrameDict.has(rdf.id)) {
+        if (self.othersForcedDownsyncRenderFrameDict.has(rdf.Id)) {
-          const delayedInputFrameId = gopkgs.ConvertToDelayedInputFrameId(rdf.id);
+          const delayedInputFrameId = gopkgs.ConvertToDelayedInputFrameId(rdf.Id);
-          const othersForcedDownsyncRenderFrame = self.othersForcedDownsyncRenderFrameDict.get(rdf.id);
+          const othersForcedDownsyncRenderFrame = self.othersForcedDownsyncRenderFrameDict.get(rdf.Id);
           if (self.lastAllConfirmedInputFrameId >= delayedInputFrameId && !self.equalRoomDownsyncFrames(othersForcedDownsyncRenderFrame, rdf)) {
-            console.warn(`Mismatched render frame@rdf.id=${rdf.id} w/ inputFrameId=${delayedInputFrameId}:
+            console.warn(`Mismatched render frame@rdf.id=${rdf.Id} w/ inputFrameId=${delayedInputFrameId}:
 rdf=${JSON.stringify(rdf)}
 othersForcedDownsyncRenderFrame=${JSON.stringify(othersForcedDownsyncRenderFrame)}`);
             // closeWSConnection(constants.RET_CODE.CLIENT_MISMATCHED_RENDER_FRAME, "");
             // self.onManualRejoinRequired("[DEBUG] CLIENT_MISMATCHED_RENDER_FRAME");
             rdf = othersForcedDownsyncRenderFrame;
-            self.othersForcedDownsyncRenderFrameDict.delete(rdf.id);
+            self.othersForcedDownsyncRenderFrameDict.delete(rdf.Id);
           }
         }
         self.applyRoomDownsyncFrameDynamics(rdf, prevRdf);
@@ -1053,6 +1108,77 @@ othersForcedDownsyncRenderFrame=${JSON.stringify(othersForcedDownsyncRenderFrame
       playerRichInfo.scriptIns.updateCharacterAnim(currPlayerDownsync, prevRdfPlayer, false, chConfig);
     }
 
+    // Move all to infinitely far away first
+    for (let k in self.cachedFireballs.list) {
+      const pqNode = self.cachedFireballs.list[k];
+      const fireball = pqNode.value;
+      fireball.node.setPosition(cc.v2(Number.MAX_VALUE, Number.MAX_VALUE));
+    }
+    for (let k in rdf.MeleeBullets) {
+      const meleeBullet = rdf.MeleeBullets[k];
+      const isExploding = (window.BULLET_STATE.Exploding == meleeBullet.BlState);
+      if (isExploding) {
+        let pqNode = self.cachedFireballs.popAny(meleeBullet.BattleAttr.BulletLocalId);
+        let speciesName = `MeleeExplosion`;
+        let animName = `MeleeExplosion${meleeBullet.Bullet.SpeciesId}`;
+
+        const offender = rdf.PlayersArr[meleeBullet.BattleAttr.OffenderJoinIndex - 1];
+        let xfac = 1; // By now, straight Punch offset doesn't respect "y-axis"
+        if (0 > offender.DirX) {
+          xfac = -1;
+        }
+        const [wx, wy] = gopkgs.VirtualGridToWorldPos(offender.VirtualGridX + xfac * meleeBullet.Bullet.HitboxOffsetX, offender.VirtualGridY);
+
+        if (null == pqNode) {
+          pqNode = self.cachedFireballs.pop();
+        //console.log(`@rdf.Id=${rdf.Id}, origRdfId=${meleeBullet.BattleAttr.OriginatedRenderFrameId}, startupFrames=${meleeBullet.Bullet.StartupFrames}, using a new fireball node for rendering for bulletLocalId=${meleeBullet.BattleAttr.BulletLocalId} at wpos=(${wx},${wy})`);
+        } else {
+          //console.log(`@rdf.Id=${rdf.Id}, origRdfId=${meleeBullet.BattleAttr.OriginatedRenderFrameId}, startupFrames=${meleeBullet.Bullet.StartupFrames}, using a cached fireball node for rendering for bulletLocalId=${meleeBullet.BattleAttr.BulletLocalId} at wpos=(${wx},${wy})`);
+        }
+        const cachedFireball = pqNode.value;
+        cachedFireball.setSpecies(speciesName, meleeBullet, rdf);
+        const newAnimIdx = meleeBullet.Bullet.SpeciesId - 1;
+        cachedFireball.updateAnim(animName, meleeBullet.FramesInBlState, offender.DirX, false, rdf, newAnimIdx);
+        cachedFireball.lastUsed = self.renderFrameId;
+        cachedFireball.bulletLocalId = meleeBullet.BattleAttr.BulletLocalId;
+        cachedFireball.node.setPosition(cc.v2(wx, wy));
+
+        self.cachedFireballs.push(cachedFireball.lastUsed, cachedFireball, meleeBullet.BattleAttr.BulletLocalId);
+      } else {
+        //console.log(`@rdf.Id=${rdf.Id}, origRdfId=${meleeBullet.BattleAttr.OriginatedRenderFrameId}, startupFrames=${meleeBullet.Bullet.StartupFrames}, activeFrames=${meleeBullet.Bullet.ActiveFrames}, not rendering melee node for bulletLocalId=${meleeBullet.BattleAttr.BulletLocalId}`);
+      }
+    }
+    for (let k in rdf.FireballBullets) {
+      const fireballBullet = rdf.FireballBullets[k];
+      const isExploding = (window.BULLET_STATE.Exploding == fireballBullet.BlState);
+      if (gopkgs.IsFireballBulletActive(fireballBullet, rdf) || isExploding) {
+        let pqNode = self.cachedFireballs.popAny(fireballBullet.BattleAttr.BulletLocalId);
+        let speciesName = `Fireball${fireballBullet.Bullet.SpeciesId}`;
+        let animName = (BULLET_STATE.Exploding == fireballBullet.BlState ? `Fireball${fireballBullet.Bullet.SpeciesId}Explosion` : speciesName);
+
+        const [wx, wy] = gopkgs.VirtualGridToWorldPos(fireballBullet.VirtualGridX, fireballBullet.VirtualGridY);
+
+        if (null == pqNode) {
+          pqNode = self.cachedFireballs.pop();
+        //console.log(`@rdf.Id=${rdf.Id}, origRdfId=${fireballBullet.BattleAttr.OriginatedRenderFrameId}, startupFrames=${fireballBullet.Bullet.StartupFrames}, using a new fireball node for rendering for bulletLocalId=${fireballBullet.BattleAttr.BulletLocalId} at wpos=(${wx},${wy})`);
+        } else {
+          //console.log(`@rdf.Id=${rdf.Id}, origRdfId=${fireballBullet.BattleAttr.OriginatedRenderFrameId}, startupFrames=${fireballBullet.Bullet.StartupFrames}, using a cached fireball node for rendering for bulletLocalId=${fireballBullet.BattleAttr.BulletLocalId} at wpos=(${wx},${wy})`);
+        }
+        const cachedFireball = pqNode.value;
+        cachedFireball.setSpecies(speciesName, fireballBullet, rdf);
+        const spontaneousLooping = !isExploding;
+        const newAnimIdx = (spontaneousLooping ? 0 : 1);
+        cachedFireball.updateAnim(animName, fireballBullet.FramesInBlState, fireballBullet.DirX, spontaneousLooping, rdf, newAnimIdx);
+        cachedFireball.lastUsed = self.renderFrameId;
+        cachedFireball.bulletLocalId = fireballBullet.BattleAttr.BulletLocalId;
+        cachedFireball.node.setPosition(cc.v2(wx, wy));
+
+        self.cachedFireballs.push(cachedFireball.lastUsed, cachedFireball, fireballBullet.BattleAttr.BulletLocalId);
+      } else {
+        //console.log(`@rdf.Id=${rdf.Id}, origRdfId=${fireballBullet.BattleAttr.OriginatedRenderFrameId}, startupFrames=${fireballBullet.Bullet.StartupFrames}, activeFrames=${fireballBullet.Bullet.ActiveFrames}, not rendering fireball node for bulletLocalId=${fireballBullet.BattleAttr.BulletLocalId}`);
+      }
+    }
+
     // Update countdown
     self.countdownNanos = self.battleDurationNanos - self.renderFrameId * self.rollbackEstimatedDtNanos;
     if (self.countdownNanos <= 0) {
@@ -1070,13 +1196,8 @@ othersForcedDownsyncRenderFrame=${JSON.stringify(othersForcedDownsyncRenderFrame
         throw `Couldn't find renderFrame for i=${i} to rollback (are you using Firefox?), self.renderFrameId=${self.renderFrameId}, lastAllConfirmedInputFrameId=${self.lastAllConfirmedInputFrameId}, might've been interruptted by onRoomDownsyncFrame`;
       }
       const j = gopkgs.ConvertToDelayedInputFrameId(i);
-      const delayedInputFrame = self.recentInputCache.GetByFrameId(j); // Don't make prediction here, the inputFrameDownsyncs in recentInputCache was already predicted while prefabbing
+      const delayedInputFrame = self.getOrPrefabInputFrameUpsync(j);
-      if (null == delayedInputFrame) {
-        // Shouldn't happen!
-        throw `Failed to get cached delayedInputFrame for i=${i}, j=${j}, renderFrameId=${self.renderFrameId}, lastUpsyncInputFrameId=${self.lastUpsyncInputFrameId}, lastAllConfirmedInputFrameId=${self.lastAllConfirmedInputFrameId}, chaserRenderFrameId=${self.chaserRenderFrameId}; recentRenderCache=${self._stringifyRecentRenderCache(false)}, recentInputCache=${self._stringifyRecentInputCache(false)}`;
-      }
 
-      const jPrev = gopkgs.ConvertToDelayedInputFrameId(i - 1);
       if (self.frameDataLoggingEnabled) {
         const actuallyUsedInputClone = delayedInputFrame.InputList.slice();
         const inputFrameDownsyncClone = {
@@ -1174,7 +1295,12 @@ othersForcedDownsyncRenderFrame=${JSON.stringify(othersForcedDownsyncRenderFrame
 
   playerDownsyncStr(playerDownsync) {
     if (null == playerDownsync) return "";
-    return `{${playerDownsync.JoinIndex},${playerDownsync.VirtualGridX},${playerDownsync.VirtualGridY},${playerDownsync.VelX},${playerDownsync.VelY},${playerDownsync.FramesToRecover},${playerDownsync.InAir ? 1 : 0}}`;
+    return `{${playerDownsync.JoinIndex},${playerDownsync.VirtualGridX},${playerDownsync.VirtualGridY},${playerDownsync.VelX},${playerDownsync.VelY},${playerDownsync.FramesToRecover},${playerDownsync.InAir ? 1 : 0},${playerDownsync.OnWall ? 1 : 0}}`;
+  },
+
+  fireballDownsyncStr(fireball) {
+    if (null == fireball) return "";
+    return `{${fireball.BattleAttr.BulletLocalId},${fireball.BattleAttr.OriginatedRenderFrameId},${fireball.BattleAttr.OffenderJoinIndex},${fireball.VirtualGridX},${fireball.VirtualGridY},${fireball.VelX},${fireball.VelY},${fireball.DirX},${fireball.DirY},${fireball.Bullet.HitboxSizeX},${fireball.Bullet.HitboxSizeY}}`;
   },
 
   inputFrameDownsyncStr(inputFrameDownsync) {
@@ -1203,8 +1329,13 @@ othersForcedDownsyncRenderFrame=${JSON.stringify(othersForcedDownsyncRenderFrame
       for (let k in rdf.PlayersArr) {
         playersStrBldr.push(self.playerDownsyncStr(rdf.PlayersArr[k]));
       }
+      const fireballsStrBldr = [];
+      for (let k in rdf.FireballBullets) {
+        fireballsStrBldr.push(self.fireballDownsyncStr(rdf.FireballBullets[k]));
+      }
       s.push(`rdfId:${i}
 players:[${playersStrBldr.join(',')}]
+fireballs:[${fireballsStrBldr.join(',')}]
 actuallyUsedinputList:{${self.inputFrameDownsyncStr(actuallyUsedInputClone)}}`);
     }
 
@@ -1242,6 +1373,7 @@ actuallyUsedinputList:{${self.inputFrameDownsyncStr(actuallyUsedInputClone)}}`);
           case ATK_CHARACTER_STATE.BlownUp1[0]:
           case ATK_CHARACTER_STATE.InAirIdle1NoJump[0]:
           case ATK_CHARACTER_STATE.InAirIdle1ByJump[0]:
+          case ATK_CHARACTER_STATE.OnWall[0]:
             [colliderWidth, colliderHeight] = [player.ColliderRadius * 2, player.ColliderRadius * 2];
             break;
         }
@@ -1262,12 +1394,8 @@ actuallyUsedinputList:{${self.inputFrameDownsyncStr(actuallyUsedInputClone)}}`);
 
       for (let k in rdf.MeleeBullets) {
         const meleeBullet = rdf.MeleeBullets[k];
-        if (
+        if (gopkgs.IsMeleeBulletActive(meleeBullet, rdf)) {
-          meleeBullet.Bullet.OriginatedRenderFrameId + meleeBullet.Bullet.StartupFrames <= rdf.Id
+          const offender = rdf.PlayersArr[meleeBullet.BattleAttr.OffenderJoinIndex - 1];
-          &&
-          meleeBullet.Bullet.OriginatedRenderFrameId + meleeBullet.Bullet.StartupFrames + meleeBullet.Bullet.ActiveFrames > rdf.Id
-        ) {
-          const offender = rdf.PlayersArr[meleeBullet.Bullet.OffenderJoinIndex - 1];
           if (1 == offender.JoinIndex) {
             g2.strokeColor = cc.Color.BLUE;
           } else {
@@ -1294,12 +1422,8 @@ actuallyUsedinputList:{${self.inputFrameDownsyncStr(actuallyUsedInputClone)}}`);
 
       for (let k in rdf.FireballBullets) {
         const fireballBullet = rdf.FireballBullets[k];
-        if (
+        if (gopkgs.IsFireballBulletActive(fireballBullet, rdf)) {
-          fireballBullet.Bullet.OriginatedRenderFrameId + fireballBullet.Bullet.StartupFrames <= rdf.Id
+          const offender = rdf.PlayersArr[fireballBullet.BattleAttr.OffenderJoinIndex - 1];
-          &&
-          fireballBullet.Bullet.OriginatedRenderFrameId + fireballBullet.Bullet.StartupFrames + fireballBullet.Bullet.ActiveFrames > rdf.Id
-        ) {
-          const offender = rdf.PlayersArr[fireballBullet.Bullet.OffenderJoinIndex - 1];
           if (1 == offender.JoinIndex) {
             g2.strokeColor = cc.Color.BLUE;
           } else {

frontend/assets/scripts/OfflineMap.js

@@ -13,7 +13,7 @@ cc.Class({
   onLoad() {
     const self = this;
     window.mapIns = self;
-    self.showCriticalCoordinateLabels = true;
+    self.showCriticalCoordinateLabels = false;
 
     const mapNode = self.node;
     const canvasNode = mapNode.parent;
@@ -29,7 +29,7 @@ cc.Class({
     /** Init required prefab ended. */
 
     self.inputFrameUpsyncDelayTolerance = 2;
-    self.collisionMinStep = 8;
+    self.collisionMinStep = 2;
 
     self.renderCacheSize = 1024;
     self.serverFps = 60;
@@ -92,9 +92,11 @@ cc.Class({
 
       const p1Vpos = gopkgs.WorldToVirtualGridPos(boundaryObjs.playerStartingPositions[0].x, boundaryObjs.playerStartingPositions[0].y);
       const p2Vpos = gopkgs.WorldToVirtualGridPos(boundaryObjs.playerStartingPositions[1].x, boundaryObjs.playerStartingPositions[1].y);
-      const speedV = gopkgs.WorldToVirtualGridPos(1.0, 0);
       const colliderRadiusV = gopkgs.WorldToVirtualGridPos(12.0, 0);
 
+      const speciesIdList = [4096, 1];
+      const chConfigsOrderedByJoinIndex = gopkgs.GetCharacterConfigsOrderedByJoinIndex(speciesIdList);
+
       const startRdf = window.pb.protos.RoomDownsyncFrame.create({
         id: window.MAGIC_ROOM_DOWNSYNC_FRAME_ID.BATTLE_START,
         playersArr: [
@@ -103,7 +105,7 @@ cc.Class({
             joinIndex: 1,
             virtualGridX: p1Vpos[0],
             virtualGridY: p1Vpos[1],
-            speed: speedV[0],
+            speed: chConfigsOrderedByJoinIndex[0].Speed,
             colliderRadius: colliderRadiusV[0],
             characterState: window.ATK_CHARACTER_STATE.InAirIdle1NoJump[0],
             framesToRecover: 0,
@@ -112,13 +114,14 @@ cc.Class({
             velX: 0,
             velY: 0,
             inAir: true,
+            onWall: false,
           }),
           window.pb.protos.PlayerDownsync.create({
             id: 11,
             joinIndex: 2,
             virtualGridX: p2Vpos[0],
             virtualGridY: p2Vpos[1],
-            speed: speedV[0],
+            speed: chConfigsOrderedByJoinIndex[1].Speed,
             colliderRadius: colliderRadiusV[0],
             characterState: window.ATK_CHARACTER_STATE.InAirIdle1NoJump[0],
             framesToRecover: 0,
@@ -127,9 +130,10 @@ cc.Class({
             velX: 0,
             velY: 0,
             inAir: true,
+            onWall: false,
           }),
         ],
-        speciesIdList: [4096, 0],
+        speciesIdList: speciesIdList,
       });
 
       self.selfPlayerInfo = {

frontend/assets/scripts/PriorityQueue.js

@@ -12,32 +12,15 @@ var BinaryHeap = function (customCompare) {
    * @private
    */
   this.list = [];
+  this.lookupKeyToIndex = {};
 
   if (customCompare) {
     this.compare = customCompare;
   }
 };
 
-/**
+BinaryHeap.prototype.contains = function (lookupKey) {
- * Builds a heap with the provided keys and values, this will discard the
+  return null != this.lookupKeyToIndex[lookupKey];
- * heap's current data.
- *
- * @param {Array} keys An array of keys.
- * @param {Array} values An array of values. This must be the same size as the
- * key array.
- */
-BinaryHeap.prototype.buildHeap = function (keys, values) {
-  if (typeof values !== 'undefined' && values.length !== keys.length) {
-    throw new Error('Key array must be the same length as value array');
-  }
-
-  var nodeArray = [];
-
-  for (var i = 0; i < keys.length; i++) {
-    nodeArray.push(new Node(keys[i], values ? values[i] : undefined));
-  }
-
-  buildHeapFromNodeArray(this, nodeArray);
 };
 
 /**
@@ -45,6 +28,7 @@ BinaryHeap.prototype.buildHeap = function (keys, values) {
  */
 BinaryHeap.prototype.clear = function () {
   this.list.length = 0;
+  this.lookupKeyToIndex = null;
 };
 
 /**
@@ -53,15 +37,20 @@ BinaryHeap.prototype.clear = function () {
  * @return {Node} node The heap's minimum node or undefined if the heap is
  * empty.
  */
-BinaryHeap.prototype.extractMinimum = function () {
+BinaryHeap.prototype.pop = function () {
-  if (!this.list.length) {
+  if (0 == this.list.length) {
-    return undefined;
+    return null;
   }
-  if (this.list.length === 1) {
+  if (1 == this.list.length) {
+    delete this.lookupKeyToIndex[Object.keys(this.lookupKeyToIndex)[0]];
     return this.list.shift();
   }
   var min = this.list[0];
+  delete this.lookupKeyToIndex[min.lookupKey];
+
   this.list[0] = this.list.pop();
+  this.lookupKeyToIndex[this.list[0].lookupKey] = 0;
+
   heapify(this, 0);
   return min;
 };
@@ -72,8 +61,8 @@ BinaryHeap.prototype.extractMinimum = function () {
  * @return {Node} node The heap's minimum node or undefined if the heap is
  * empty.
  */
-BinaryHeap.prototype.findMinimum = function () {
+BinaryHeap.prototype.top = function () {
-  return this.isEmpty() ? undefined : this.list[0];
+  return this.isEmpty() ? null : this.list[0];
 };
 
 /**
@@ -83,25 +72,79 @@ BinaryHeap.prototype.findMinimum = function () {
  * @param {Object} value The value to insert.
  * @return {Node} node The inserted node.
  */
-BinaryHeap.prototype.insert = function (key, value) {
+BinaryHeap.prototype.push = function (key, value, lookupKey) {
   var i = this.list.length;
-  var node = new Node(key, value);
+  var node = new Node(key, value, lookupKey);
   this.list.push(node);
-  var parent = getParent(i);
+  this.lookupKeyToIndex[lookupKey] = i;
-  while (typeof parent !== 'undefined' &&
+  let u = getParent(i);
-      this.compare(this.list[i], this.list[parent]) < 0) {
+  while (null != u && this.compare(this.list[i], this.list[u]) < 0) {
-    swap(this.list, i, parent);
+    swap(this.list, i, u, this.lookupKeyToIndex);
-    i = parent;
+    i = u;
-    parent = getParent(i);
+    u = getParent(i);
   }
   return node;
 };
 
+BinaryHeap.prototype.update = function (lookupKey, newKey, newValue) {
+  if (null == this.lookupKeyToIndex[lookupKey]) return null;
+  var i = this.lookupKeyToIndex[lookupKey];
+
+  this.list[i].key = newKey;
+  this.list[i].value = newValue;
+
+  let u = getParent(i);
+  if (null != u && this.compare(this.list[i], this.list[u]) < 0) {
+    while (null != u && this.compare(this.list[i], this.list[u]) < 0) {
+      swap(this.list, i, u, this.lookupKeyToIndex);
+      i = u;
+      u = getParent(i);
+    }
+  } else {
+    heapify(this, i);
+  }
+};
+
+BinaryHeap.prototype.popAny = function (lookupKey) {
+  if (null == this.lookupKeyToIndex[lookupKey]) return null;
+
+  if (0 == this.list.length) {
+    return null;
+  }
+
+  if (1 == this.list.length) {
+    delete this.lookupKeyToIndex[Object.keys(this.lookupKeyToIndex)[0]];
+    return this.list.shift();
+  }
+
+  var i = this.lookupKeyToIndex[lookupKey];
+
+
+  var old = this.list[i];
+  delete this.lookupKeyToIndex[old.lookupKey];
+
+  this.list[i] = this.list.pop();
+  this.lookupKeyToIndex[this.list[i].lookupKey] = i;
+
+  let u = getParent(i);
+  if (null != u && this.compare(this.list[i], this.list[u]) < 0) {
+    while (null != u && this.compare(this.list[i], this.list[u]) < 0) {
+      swap(this.list, i, u, this.lookupKeyToIndex);
+      i = u;
+      u = getParent(i);
+    }
+  } else {
+    heapify(this, i);
+  }
+  
+  return old;
+};
+
 /**
  * @return {boolean} Whether the heap is empty.
  */
 BinaryHeap.prototype.isEmpty = function () {
-  return !this.list.length;
+  return 0 == this.list.length;
 };
 
 /**
@@ -111,16 +154,6 @@ BinaryHeap.prototype.size = function () {
   return this.list.length;
 };
 
-/**
- * Joins another heap to this one.
- *
- * @param {BinaryHeap} otherHeap The other heap.
- */
-BinaryHeap.prototype.union = function (otherHeap) {
-  var array = this.list.concat(otherHeap.list);
-  buildHeapFromNodeArray(this, array);
-};
-
 /**
  * Compares two nodes with each other.
  *
@@ -147,34 +180,27 @@ BinaryHeap.prototype.compare = function (a, b) {
  * @param {number} i The index of the node to heapify.
  */
 function heapify(heap, i) {
-  var l = getLeft(i);
+  let cur = i;
-  var r = getRight(i);
+  let smallest = -1;
-  var smallest = i;
+  while (cur != smallest) {
-  if (l < heap.list.length &&
+    const l = getLeft(cur);
-      heap.compare(heap.list[l], heap.list[i]) < 0) {
+    const r = getRight(cur);
-    smallest = l;
-  }
-  if (r < heap.list.length &&
-      heap.compare(heap.list[r], heap.list[smallest]) < 0) {
-    smallest = r;
-  }
-  if (smallest !== i) {
-    swap(heap.list, i, smallest);
-    heapify(heap, smallest);
-  }
-}
     
-/**
+    smallest = cur;
- * Builds a heap from a node array, this will discard the heap's current data.
+    if (l < heap.list.length &&
- *
+        heap.compare(heap.list[l], heap.list[smallest]) < 0) {
- * @private
+      smallest = l;
- * @param {BinaryHeap} heap The heap to override.
+    }
- * @param {Node[]} nodeArray The array of nodes for the new heap.
+    if (r < heap.list.length &&
- */
+        heap.compare(heap.list[r], heap.list[smallest]) < 0) {
-function buildHeapFromNodeArray(heap, nodeArray) {
+      smallest = r;
-  heap.list = nodeArray;
+    }
-  for (var i = Math.floor(heap.list.length / 2); i >= 0; i--) {
+
-    heapify(heap, i);
+    if (smallest !== cur) {
+      swap(heap.list, cur, smallest, heap.lookupKeyToIndex);
+      cur = smallest;
+      smallest = -1;
+    }
   }
 }
 
@@ -186,10 +212,16 @@ function buildHeapFromNodeArray(heap, nodeArray) {
  * @param {number} a The index of the first element.
  * @param {number} b The index of the second element.
  */
-function swap(array, a, b) {
+function swap(array, a, b, lookupKeyToIndex) {
+  var aLookupKey = array[a].lookupKey;
+  var bLookupKey = array[b].lookupKey;
+
   var temp = array[a];
   array[a] = array[b];
   array[b] = temp;
+
+  lookupKeyToIndex[aLookupKey] = b; 
+  lookupKeyToIndex[bLookupKey] = a; 
 }
 
 /**
@@ -200,8 +232,8 @@ function swap(array, a, b) {
  * @return {number} The index of the node's parent.
  */
 function getParent(i) {
-  if (i === 0) {
+  if (0 == i) {
-    return undefined;
+    return null;
   }
   return Math.floor((i - 1) / 2);
 }
@@ -235,9 +267,10 @@ function getRight(i) {
  * @param {Object} key The key of the new node.
  * @param {Object} value The value of the new node.
  */
-function Node(key, value) {
+function Node(key, value, lookupKey) {
   this.key = key;
   this.value = value;
+  this.lookupKey = lookupKey;
 }
 
 module.exports = BinaryHeap;

frontend/assets/scripts/PriorityQueue.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.5",
+  "uuid": "20a75b4a-e220-42cd-bab4-9fc63a289b3f",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

frontend/assets/scripts/TouchEventsManager.js

@@ -106,8 +106,13 @@ cc.Class({
     this.cachedBtnDownLevel = 0;
     this.cachedBtnLeftLevel = 0;
     this.cachedBtnRightLevel = 0;
+
+    this.realtimeBtnALevel = 0;
     this.cachedBtnALevel = 0;
+    this.btnAEdgeTriggerLock = false;
+    this.realtimeBtnBLevel = 0;
     this.cachedBtnBLevel = 0;
+    this.btnBEdgeTriggerLock = false;
 
     this.canvasNode = this.mapNode.parent;
     this.mainCameraNode = this.canvasNode.getChildByName("Main Camera"); // Cannot drag and assign the `mainCameraNode` from CocosCreator EDITOR directly, otherwise it'll cause an infinite loading time, till v2.1.0.
@@ -163,30 +168,30 @@ cc.Class({
 
     if (self.btnA) {
       self.btnA.on(cc.Node.EventType.TOUCH_START, function(evt) {
-        self.cachedBtnALevel = 1;
+        self._triggerEdgeBtnA(true);
         evt.target.runAction(cc.scaleTo(0.1, 0.3));
       });
       self.btnA.on(cc.Node.EventType.TOUCH_END, function(evt) {
-        self.cachedBtnALevel = 0;
+        self._triggerEdgeBtnA(false);
         evt.target.runAction(cc.scaleTo(0.1, 1.0));
       });
       self.btnA.on(cc.Node.EventType.TOUCH_CANCEL, function(evt) {
-        self.cachedBtnALevel = 0;
+        self._triggerEdgeBtnA(false);
         evt.target.runAction(cc.scaleTo(0.1, 1.0));
       });
     }
 
     if (self.btnB) {
       self.btnB.on(cc.Node.EventType.TOUCH_START, function(evt) {
-        self.cachedBtnBLevel = 1;
+        self._triggerEdgeBtnB(true);
         evt.target.runAction(cc.scaleTo(0.1, 0.3));
       });
       self.btnB.on(cc.Node.EventType.TOUCH_END, function(evt) {
-        self.cachedBtnBLevel = 0;
+        self._triggerEdgeBtnB(false);
         evt.target.runAction(cc.scaleTo(0.1, 1.0));
       });
       self.btnB.on(cc.Node.EventType.TOUCH_CANCEL, function(evt) {
-        self.cachedBtnBLevel = 0;
+        self._triggerEdgeBtnB(false);
         evt.target.runAction(cc.scaleTo(0.1, 1.0));
       });
     }
@@ -195,22 +200,38 @@ cc.Class({
     cc.systemEvent.on(cc.SystemEvent.EventType.KEY_DOWN, function(evt) {
       switch (evt.keyCode) {
         case cc.macro.KEY.w:
+          self.cachedBtnUpLevel = 0;
+          self.cachedBtnDownLevel = 0;
+          self.cachedBtnLeftLevel = 0;
+          self.cachedBtnRightLevel = 0;
           self.cachedBtnUpLevel = 1;
           break;
         case cc.macro.KEY.s:
+          self.cachedBtnUpLevel = 0;
+          self.cachedBtnDownLevel = 0;
+          self.cachedBtnLeftLevel = 0;
+          self.cachedBtnRightLevel = 0;
           self.cachedBtnDownLevel = 1;
           break;
         case cc.macro.KEY.a:
+          self.cachedBtnUpLevel = 0;
+          self.cachedBtnDownLevel = 0;
+          self.cachedBtnLeftLevel = 0;
+          self.cachedBtnRightLevel = 0;
           self.cachedBtnLeftLevel = 1;
           break;
         case cc.macro.KEY.d:
+          self.cachedBtnUpLevel = 0;
+          self.cachedBtnDownLevel = 0;
+          self.cachedBtnLeftLevel = 0;
+          self.cachedBtnRightLevel = 0;
           self.cachedBtnRightLevel = 1;
           break;
         case cc.macro.KEY.h:
-          self.cachedBtnALevel = 1;
+          self._triggerEdgeBtnA(true);
           break;
         case cc.macro.KEY.j:
-          self.cachedBtnBLevel = 1;
+          self._triggerEdgeBtnB(true);
           break;
         default:
           break;
@@ -232,10 +253,10 @@ cc.Class({
           self.cachedBtnRightLevel = 0;
           break;
         case cc.macro.KEY.h:
-          self.cachedBtnALevel = 0;
+          self._triggerEdgeBtnA(false);
           break;
         case cc.macro.KEY.j:
-          self.cachedBtnBLevel = 0;
+          self._triggerEdgeBtnB(false);
           break;
         default:
           break;
@@ -448,6 +469,12 @@ cc.Class({
     const discretizedDir = this.discretizeDirection(this.stickhead.x, this.stickhead.y, this.joyStickEps).encodedIdx; // There're only 9 dirs, thus using only the lower 4-bits
     const btnALevel = (this.cachedBtnALevel << 4);
     const btnBLevel = (this.cachedBtnBLevel << 5);
+
+    this.cachedBtnALevel = this.realtimeBtnALevel;
+    this.cachedBtnBLevel = this.realtimeBtnBLevel;
+
+    this.btnAEdgeTriggerLock = false;
+    this.btnBEdgeTriggerLock = false;
     return (btnBLevel + btnALevel + discretizedDir);
   },
 
@@ -466,4 +493,20 @@ cc.Class({
       btnBLevel: btnBLevel,
     });
   },
+
+  _triggerEdgeBtnA(rising) {
+    this.realtimeBtnALevel = (rising ? 1 : 0);
+    if (!this.btnAEdgeTriggerLock && (1 - this.realtimeBtnALevel) == this.cachedBtnALevel) {
+      this.cachedBtnALevel = this.realtimeBtnALevel;
+      this.btnAEdgeTriggerLock = true;
+    }
+  },
+
+  _triggerEdgeBtnB(rising) {
+    this.realtimeBtnBLevel = (rising ? 1 : 0);
+    if (!this.btnBEdgeTriggerLock && (1 - this.realtimeBtnBLevel) == this.cachedBtnBLevel) {
+      this.cachedBtnBLevel = this.realtimeBtnBLevel;
+      this.btnBEdgeTriggerLock = true;
+    }
+  },
 });

frontend/assets/scripts/modules/room_downsync_frame_proto_bundle.forcemsg.js

@@ -1216,6 +1216,9 @@ $root.protos = (function() {
          * @property {number|null} [framesInvinsible] PlayerDownsync framesInvinsible
          * @property {number|null} [bulletTeamId] PlayerDownsync bulletTeamId
          * @property {number|null} [chCollisionTeamId] PlayerDownsync chCollisionTeamId
+         * @property {boolean|null} [onWall] PlayerDownsync onWall
+         * @property {number|null} [onWallNormX] PlayerDownsync onWallNormX
+         * @property {number|null} [onWallNormY] PlayerDownsync onWallNormY
          * @property {string|null} [name] PlayerDownsync name
          * @property {string|null} [displayName] PlayerDownsync displayName
          * @property {string|null} [avatar] PlayerDownsync avatar
@@ -1436,6 +1439,30 @@ $root.protos = (function() {
          */
         PlayerDownsync.prototype.chCollisionTeamId = 0;
 
+        /**
+         * PlayerDownsync onWall.
+         * @member {boolean} onWall
+         * @memberof protos.PlayerDownsync
+         * @instance
+         */
+        PlayerDownsync.prototype.onWall = false;
+
+        /**
+         * PlayerDownsync onWallNormX.
+         * @member {number} onWallNormX
+         * @memberof protos.PlayerDownsync
+         * @instance
+         */
+        PlayerDownsync.prototype.onWallNormX = 0;
+
+        /**
+         * PlayerDownsync onWallNormY.
+         * @member {number} onWallNormY
+         * @memberof protos.PlayerDownsync
+         * @instance
+         */
+        PlayerDownsync.prototype.onWallNormY = 0;
+
         /**
          * PlayerDownsync name.
          * @member {string} name
@@ -1534,6 +1561,12 @@ $root.protos = (function() {
                 writer.uint32(/* id 24, wireType 0 =*/192).int32(message.bulletTeamId);
             if (message.chCollisionTeamId != null && Object.hasOwnProperty.call(message, "chCollisionTeamId"))
                 writer.uint32(/* id 25, wireType 0 =*/200).int32(message.chCollisionTeamId);
+            if (message.onWall != null && Object.hasOwnProperty.call(message, "onWall"))
+                writer.uint32(/* id 26, wireType 0 =*/208).bool(message.onWall);
+            if (message.onWallNormX != null && Object.hasOwnProperty.call(message, "onWallNormX"))
+                writer.uint32(/* id 27, wireType 0 =*/216).int32(message.onWallNormX);
+            if (message.onWallNormY != null && Object.hasOwnProperty.call(message, "onWallNormY"))
+                writer.uint32(/* id 28, wireType 0 =*/224).int32(message.onWallNormY);
             if (message.name != null && Object.hasOwnProperty.call(message, "name"))
                 writer.uint32(/* id 997, wireType 2 =*/7978).string(message.name);
             if (message.displayName != null && Object.hasOwnProperty.call(message, "displayName"))
@@ -1674,6 +1707,18 @@ $root.protos = (function() {
                         message.chCollisionTeamId = reader.int32();
                         break;
                     }
+                case 26: {
+                        message.onWall = reader.bool();
+                        break;
+                    }
+                case 27: {
+                        message.onWallNormX = reader.int32();
+                        break;
+                    }
+                case 28: {
+                        message.onWallNormY = reader.int32();
+                        break;
+                    }
                 case 997: {
                         message.name = reader.string();
                         break;
@@ -1796,6 +1841,15 @@ $root.protos = (function() {
             if (message.chCollisionTeamId != null && message.hasOwnProperty("chCollisionTeamId"))
                 if (!$util.isInteger(message.chCollisionTeamId))
                     return "chCollisionTeamId: integer expected";
+            if (message.onWall != null && message.hasOwnProperty("onWall"))
+                if (typeof message.onWall !== "boolean")
+                    return "onWall: boolean expected";
+            if (message.onWallNormX != null && message.hasOwnProperty("onWallNormX"))
+                if (!$util.isInteger(message.onWallNormX))
+                    return "onWallNormX: integer expected";
+            if (message.onWallNormY != null && message.hasOwnProperty("onWallNormY"))
+                if (!$util.isInteger(message.onWallNormY))
+                    return "onWallNormY: integer expected";
             if (message.name != null && message.hasOwnProperty("name"))
                 if (!$util.isString(message.name))
                     return "name: string expected";
@@ -1870,6 +1924,12 @@ $root.protos = (function() {
                 message.bulletTeamId = object.bulletTeamId | 0;
             if (object.chCollisionTeamId != null)
                 message.chCollisionTeamId = object.chCollisionTeamId | 0;
+            if (object.onWall != null)
+                message.onWall = Boolean(object.onWall);
+            if (object.onWallNormX != null)
+                message.onWallNormX = object.onWallNormX | 0;
+            if (object.onWallNormY != null)
+                message.onWallNormY = object.onWallNormY | 0;
             if (object.name != null)
                 message.name = String(object.name);
             if (object.displayName != null)
@@ -1918,6 +1978,9 @@ $root.protos = (function() {
                 object.framesInvinsible = 0;
                 object.bulletTeamId = 0;
                 object.chCollisionTeamId = 0;
+                object.onWall = false;
+                object.onWallNormX = 0;
+                object.onWallNormY = 0;
                 object.name = "";
                 object.displayName = "";
                 object.avatar = "";
@@ -1972,6 +2035,12 @@ $root.protos = (function() {
                 object.bulletTeamId = message.bulletTeamId;
             if (message.chCollisionTeamId != null && message.hasOwnProperty("chCollisionTeamId"))
                 object.chCollisionTeamId = message.chCollisionTeamId;
+            if (message.onWall != null && message.hasOwnProperty("onWall"))
+                object.onWall = message.onWall;
+            if (message.onWallNormX != null && message.hasOwnProperty("onWallNormX"))
+                object.onWallNormX = message.onWallNormX;
+            if (message.onWallNormY != null && message.hasOwnProperty("onWallNormY"))
+                object.onWallNormY = message.onWallNormY;
             if (message.name != null && message.hasOwnProperty("name"))
                 object.name = message.name;
             if (message.displayName != null && message.hasOwnProperty("displayName"))
@@ -4118,6 +4187,10 @@ $root.protos = (function() {
          * @property {boolean|null} [blowUp] MeleeBullet blowUp
          * @property {number|null} [teamId] MeleeBullet teamId
          * @property {number|null} [bulletLocalId] MeleeBullet bulletLocalId
+         * @property {number|null} [speciesId] MeleeBullet speciesId
+         * @property {number|null} [explosionFrames] MeleeBullet explosionFrames
+         * @property {number|null} [blState] MeleeBullet blState
+         * @property {number|null} [framesInBlState] MeleeBullet framesInBlState
          */
 
         /**
@@ -4295,6 +4368,38 @@ $root.protos = (function() {
          */
         MeleeBullet.prototype.bulletLocalId = 0;
 
+        /**
+         * MeleeBullet speciesId.
+         * @member {number} speciesId
+         * @memberof protos.MeleeBullet
+         * @instance
+         */
+        MeleeBullet.prototype.speciesId = 0;
+
+        /**
+         * MeleeBullet explosionFrames.
+         * @member {number} explosionFrames
+         * @memberof protos.MeleeBullet
+         * @instance
+         */
+        MeleeBullet.prototype.explosionFrames = 0;
+
+        /**
+         * MeleeBullet blState.
+         * @member {number} blState
+         * @memberof protos.MeleeBullet
+         * @instance
+         */
+        MeleeBullet.prototype.blState = 0;
+
+        /**
+         * MeleeBullet framesInBlState.
+         * @member {number} framesInBlState
+         * @memberof protos.MeleeBullet
+         * @instance
+         */
+        MeleeBullet.prototype.framesInBlState = 0;
+
         /**
          * Creates a new MeleeBullet instance using the specified properties.
          * @function create
@@ -4359,6 +4464,14 @@ $root.protos = (function() {
                 writer.uint32(/* id 19, wireType 0 =*/152).int32(message.teamId);
             if (message.bulletLocalId != null && Object.hasOwnProperty.call(message, "bulletLocalId"))
                 writer.uint32(/* id 20, wireType 0 =*/160).int32(message.bulletLocalId);
+            if (message.speciesId != null && Object.hasOwnProperty.call(message, "speciesId"))
+                writer.uint32(/* id 21, wireType 0 =*/168).int32(message.speciesId);
+            if (message.explosionFrames != null && Object.hasOwnProperty.call(message, "explosionFrames"))
+                writer.uint32(/* id 22, wireType 0 =*/176).int32(message.explosionFrames);
+            if (message.blState != null && Object.hasOwnProperty.call(message, "blState"))
+                writer.uint32(/* id 23, wireType 0 =*/184).int32(message.blState);
+            if (message.framesInBlState != null && Object.hasOwnProperty.call(message, "framesInBlState"))
+                writer.uint32(/* id 24, wireType 0 =*/192).int32(message.framesInBlState);
             return writer;
         };
 
@@ -4473,6 +4586,22 @@ $root.protos = (function() {
                         message.bulletLocalId = reader.int32();
                         break;
                     }
+                case 21: {
+                        message.speciesId = reader.int32();
+                        break;
+                    }
+                case 22: {
+                        message.explosionFrames = reader.int32();
+                        break;
+                    }
+                case 23: {
+                        message.blState = reader.int32();
+                        break;
+                    }
+                case 24: {
+                        message.framesInBlState = reader.int32();
+                        break;
+                    }
                 default:
                     reader.skipType(tag & 7);
                     break;
@@ -4568,6 +4697,18 @@ $root.protos = (function() {
             if (message.bulletLocalId != null && message.hasOwnProperty("bulletLocalId"))
                 if (!$util.isInteger(message.bulletLocalId))
                     return "bulletLocalId: integer expected";
+            if (message.speciesId != null && message.hasOwnProperty("speciesId"))
+                if (!$util.isInteger(message.speciesId))
+                    return "speciesId: integer expected";
+            if (message.explosionFrames != null && message.hasOwnProperty("explosionFrames"))
+                if (!$util.isInteger(message.explosionFrames))
+                    return "explosionFrames: integer expected";
+            if (message.blState != null && message.hasOwnProperty("blState"))
+                if (!$util.isInteger(message.blState))
+                    return "blState: integer expected";
+            if (message.framesInBlState != null && message.hasOwnProperty("framesInBlState"))
+                if (!$util.isInteger(message.framesInBlState))
+                    return "framesInBlState: integer expected";
             return null;
         };
 
@@ -4623,6 +4764,14 @@ $root.protos = (function() {
                 message.teamId = object.teamId | 0;
             if (object.bulletLocalId != null)
                 message.bulletLocalId = object.bulletLocalId | 0;
+            if (object.speciesId != null)
+                message.speciesId = object.speciesId | 0;
+            if (object.explosionFrames != null)
+                message.explosionFrames = object.explosionFrames | 0;
+            if (object.blState != null)
+                message.blState = object.blState | 0;
+            if (object.framesInBlState != null)
+                message.framesInBlState = object.framesInBlState | 0;
             return message;
         };
 
@@ -4660,6 +4809,10 @@ $root.protos = (function() {
                 object.blowUp = false;
                 object.teamId = 0;
                 object.bulletLocalId = 0;
+                object.speciesId = 0;
+                object.explosionFrames = 0;
+                object.blState = 0;
+                object.framesInBlState = 0;
             }
             if (message.originatedRenderFrameId != null && message.hasOwnProperty("originatedRenderFrameId"))
                 object.originatedRenderFrameId = message.originatedRenderFrameId;
@@ -4701,6 +4854,14 @@ $root.protos = (function() {
                 object.teamId = message.teamId;
             if (message.bulletLocalId != null && message.hasOwnProperty("bulletLocalId"))
                 object.bulletLocalId = message.bulletLocalId;
+            if (message.speciesId != null && message.hasOwnProperty("speciesId"))
+                object.speciesId = message.speciesId;
+            if (message.explosionFrames != null && message.hasOwnProperty("explosionFrames"))
+                object.explosionFrames = message.explosionFrames;
+            if (message.blState != null && message.hasOwnProperty("blState"))
+                object.blState = message.blState;
+            if (message.framesInBlState != null && message.hasOwnProperty("framesInBlState"))
+                object.framesInBlState = message.framesInBlState;
             return object;
         };
 
@@ -4759,6 +4920,10 @@ $root.protos = (function() {
          * @property {boolean|null} [blowUp] FireballBullet blowUp
          * @property {number|null} [teamId] FireballBullet teamId
          * @property {number|null} [bulletLocalId] FireballBullet bulletLocalId
+         * @property {number|null} [speciesId] FireballBullet speciesId
+         * @property {number|null} [explosionFrames] FireballBullet explosionFrames
+         * @property {number|null} [blState] FireballBullet blState
+         * @property {number|null} [framesInBlState] FireballBullet framesInBlState
          * @property {number|null} [virtualGridX] FireballBullet virtualGridX
          * @property {number|null} [virtualGridY] FireballBullet virtualGridY
          * @property {number|null} [dirX] FireballBullet dirX
@@ -4943,6 +5108,38 @@ $root.protos = (function() {
          */
         FireballBullet.prototype.bulletLocalId = 0;
 
+        /**
+         * FireballBullet speciesId.
+         * @member {number} speciesId
+         * @memberof protos.FireballBullet
+         * @instance
+         */
+        FireballBullet.prototype.speciesId = 0;
+
+        /**
+         * FireballBullet explosionFrames.
+         * @member {number} explosionFrames
+         * @memberof protos.FireballBullet
+         * @instance
+         */
+        FireballBullet.prototype.explosionFrames = 0;
+
+        /**
+         * FireballBullet blState.
+         * @member {number} blState
+         * @memberof protos.FireballBullet
+         * @instance
+         */
+        FireballBullet.prototype.blState = 0;
+
+        /**
+         * FireballBullet framesInBlState.
+         * @member {number} framesInBlState
+         * @memberof protos.FireballBullet
+         * @instance
+         */
+        FireballBullet.prototype.framesInBlState = 0;
+
         /**
          * FireballBullet virtualGridX.
          * @member {number} virtualGridX
@@ -5063,6 +5260,14 @@ $root.protos = (function() {
                 writer.uint32(/* id 19, wireType 0 =*/152).int32(message.teamId);
             if (message.bulletLocalId != null && Object.hasOwnProperty.call(message, "bulletLocalId"))
                 writer.uint32(/* id 20, wireType 0 =*/160).int32(message.bulletLocalId);
+            if (message.speciesId != null && Object.hasOwnProperty.call(message, "speciesId"))
+                writer.uint32(/* id 21, wireType 0 =*/168).int32(message.speciesId);
+            if (message.explosionFrames != null && Object.hasOwnProperty.call(message, "explosionFrames"))
+                writer.uint32(/* id 22, wireType 0 =*/176).int32(message.explosionFrames);
+            if (message.blState != null && Object.hasOwnProperty.call(message, "blState"))
+                writer.uint32(/* id 23, wireType 0 =*/184).int32(message.blState);
+            if (message.framesInBlState != null && Object.hasOwnProperty.call(message, "framesInBlState"))
+                writer.uint32(/* id 24, wireType 0 =*/192).int32(message.framesInBlState);
             if (message.virtualGridX != null && Object.hasOwnProperty.call(message, "virtualGridX"))
                 writer.uint32(/* id 999, wireType 0 =*/7992).int32(message.virtualGridX);
             if (message.virtualGridY != null && Object.hasOwnProperty.call(message, "virtualGridY"))
@@ -5191,6 +5396,22 @@ $root.protos = (function() {
                         message.bulletLocalId = reader.int32();
                         break;
                     }
+                case 21: {
+                        message.speciesId = reader.int32();
+                        break;
+                    }
+                case 22: {
+                        message.explosionFrames = reader.int32();
+                        break;
+                    }
+                case 23: {
+                        message.blState = reader.int32();
+                        break;
+                    }
+                case 24: {
+                        message.framesInBlState = reader.int32();
+                        break;
+                    }
                 case 999: {
                         message.virtualGridX = reader.int32();
                         break;
@@ -5314,6 +5535,18 @@ $root.protos = (function() {
             if (message.bulletLocalId != null && message.hasOwnProperty("bulletLocalId"))
                 if (!$util.isInteger(message.bulletLocalId))
                     return "bulletLocalId: integer expected";
+            if (message.speciesId != null && message.hasOwnProperty("speciesId"))
+                if (!$util.isInteger(message.speciesId))
+                    return "speciesId: integer expected";
+            if (message.explosionFrames != null && message.hasOwnProperty("explosionFrames"))
+                if (!$util.isInteger(message.explosionFrames))
+                    return "explosionFrames: integer expected";
+            if (message.blState != null && message.hasOwnProperty("blState"))
+                if (!$util.isInteger(message.blState))
+                    return "blState: integer expected";
+            if (message.framesInBlState != null && message.hasOwnProperty("framesInBlState"))
+                if (!$util.isInteger(message.framesInBlState))
+                    return "framesInBlState: integer expected";
             if (message.virtualGridX != null && message.hasOwnProperty("virtualGridX"))
                 if (!$util.isInteger(message.virtualGridX))
                     return "virtualGridX: integer expected";
@@ -5390,6 +5623,14 @@ $root.protos = (function() {
                 message.teamId = object.teamId | 0;
             if (object.bulletLocalId != null)
                 message.bulletLocalId = object.bulletLocalId | 0;
+            if (object.speciesId != null)
+                message.speciesId = object.speciesId | 0;
+            if (object.explosionFrames != null)
+                message.explosionFrames = object.explosionFrames | 0;
+            if (object.blState != null)
+                message.blState = object.blState | 0;
+            if (object.framesInBlState != null)
+                message.framesInBlState = object.framesInBlState | 0;
             if (object.virtualGridX != null)
                 message.virtualGridX = object.virtualGridX | 0;
             if (object.virtualGridY != null)
@@ -5441,6 +5682,10 @@ $root.protos = (function() {
                 object.blowUp = false;
                 object.teamId = 0;
                 object.bulletLocalId = 0;
+                object.speciesId = 0;
+                object.explosionFrames = 0;
+                object.blState = 0;
+                object.framesInBlState = 0;
                 object.virtualGridX = 0;
                 object.virtualGridY = 0;
                 object.dirX = 0;
@@ -5489,6 +5734,14 @@ $root.protos = (function() {
                 object.teamId = message.teamId;
             if (message.bulletLocalId != null && message.hasOwnProperty("bulletLocalId"))
                 object.bulletLocalId = message.bulletLocalId;
+            if (message.speciesId != null && message.hasOwnProperty("speciesId"))
+                object.speciesId = message.speciesId;
+            if (message.explosionFrames != null && message.hasOwnProperty("explosionFrames"))
+                object.explosionFrames = message.explosionFrames;
+            if (message.blState != null && message.hasOwnProperty("blState"))
+                object.blState = message.blState;
+            if (message.framesInBlState != null && message.hasOwnProperty("framesInBlState"))
+                object.framesInBlState = message.framesInBlState;
             if (message.virtualGridX != null && message.hasOwnProperty("virtualGridX"))
                 object.virtualGridX = message.virtualGridX;
             if (message.virtualGridY != null && message.hasOwnProperty("virtualGridY"))

frontend/settings/project.json

@@ -68,7 +68,7 @@
     "shelter_z_reducer",
     "shelter"
   ],
-  "last-module-event-record-time": 1673325961305,
+  "last-module-event-record-time": 1673930863015,
   "simulator-orientation": false,
   "simulator-resolution": {
     "height": 640,

jsexport/battle/battle.go

@@ -1,6 +1,7 @@
 package battle
 
 import (
+	//"fmt"
 	"math"
 	"resolv"
 )
@@ -21,14 +22,15 @@ const (
 	GRAVITY_X = int32(0)
 	GRAVITY_Y = -int32(float64(0.5) * WORLD_TO_VIRTUAL_GRID_RATIO) // makes all "playerCollider.Y" a multiple of 0.5 in all cases
 
-	INPUT_DELAY_FRAMES = int32(8)  // in the count of render frames
+	INPUT_DELAY_FRAMES = int32(4)  // in the count of render frames
-	INPUT_SCALE_FRAMES = uint32(2) // inputDelayedAndScaledFrameId = ((originalFrameId - InputDelayFrames) >> InputScaleFrames)
+	INPUT_SCALE_FRAMES = uint32(3) // inputDelayedAndScaledFrameId = ((originalFrameId - InputDelayFrames) >> InputScaleFrames)
 	NST_DELAY_FRAMES   = int32(16) // network-single-trip delay in the count of render frames, proposed to be (InputDelayFrames >> 1) because we expect a round-trip delay to be exactly "InputDelayFrames"
 
 	SP_ATK_LOOKUP_FRAMES = int32(5)
 
 	SNAP_INTO_PLATFORM_OVERLAP   = float64(0.1)
 	SNAP_INTO_PLATFORM_THRESHOLD = float64(0.5)
+	VERTICAL_PLATFORM_THRESHOLD  = float64(0.9)
 
 	NO_SKILL     = -1
 	NO_SKILL_HIT = -1
@@ -49,6 +51,12 @@ var DIRECTION_DECODER = [][]int32{
 	{-1, +1},
 }
 
+const (
+	BULLET_STARTUP   = int32(0)
+	BULLET_ACTIVE    = int32(1)
+	BULLET_EXPLODING = int32(2)
+)
+
 const (
 	ATK_CHARACTER_STATE_IDLE1               = int32(0)
 	ATK_CHARACTER_STATE_WALKING             = int32(1)
@@ -65,6 +73,10 @@ const (
 	ATK_CHARACTER_STATE_ATK2 = int32(11)
 	ATK_CHARACTER_STATE_ATK3 = int32(12)
 	ATK_CHARACTER_STATE_ATK4 = int32(13)
+	ATK_CHARACTER_STATE_ATK5 = int32(14)
+
+	ATK_CHARACTER_STATE_DASHING = int32(15)
+	ATK_CHARACTER_STATE_ONWALL  = int32(16)
 )
 
 var inAirSet = map[int32]bool{
@@ -73,6 +85,7 @@ var inAirSet = map[int32]bool{
 	ATK_CHARACTER_STATE_INAIR_ATK1:          true,
 	ATK_CHARACTER_STATE_INAIR_ATKED1:        true,
 	ATK_CHARACTER_STATE_BLOWN_UP1:           true,
+	ATK_CHARACTER_STATE_ONWALL:              true,
 }
 
 var noOpSet = map[int32]bool{
@@ -101,6 +114,13 @@ var nonAttackingSet = map[int32]bool{
 	ATK_CHARACTER_STATE_GET_UP1:             true,
 }
 
+func intAbs(x int32) int32 {
+	if x < 0 {
+		return -x
+	}
+	return x
+}
+
 func ShouldPrefabInputFrameDownsync(prevRenderFrameId int32, renderFrameId int32) (bool, int32) {
 	for i := prevRenderFrameId + 1; i <= renderFrameId; i++ {
 		if (0 <= i) && (0 == (i & ((1 << INPUT_SCALE_FRAMES) - 1))) {
@@ -154,7 +174,7 @@ type SatResult struct {
 	Axis          resolv.Vector
 }
 
-func CalcPushbacks(oldDx, oldDy float64, playerShape, barrierShape *resolv.ConvexPolygon) (bool, float64, float64, *SatResult) {
+func calcPushbacks(oldDx, oldDy float64, playerShape, barrierShape *resolv.ConvexPolygon) (bool, float64, float64, *SatResult) {
 	origX, origY := playerShape.Position()
 	defer func() {
 		playerShape.SetPosition(origX, origY)
@@ -206,6 +226,34 @@ func isPolygonPairOverlapped(a, b *resolv.ConvexPolygon, result *SatResult) bool
 	return true
 }
 
+func IsMeleeBulletActive(meleeBullet *MeleeBullet, currRenderFrame *RoomDownsyncFrame) bool {
+	if BULLET_EXPLODING == meleeBullet.BlState {
+		return false
+	}
+	return (meleeBullet.BattleAttr.OriginatedRenderFrameId+meleeBullet.Bullet.StartupFrames <= currRenderFrame.Id) && (meleeBullet.BattleAttr.OriginatedRenderFrameId+meleeBullet.Bullet.StartupFrames+meleeBullet.Bullet.ActiveFrames > currRenderFrame.Id)
+}
+
+func IsMeleeBulletAlive(meleeBullet *MeleeBullet, currRenderFrame *RoomDownsyncFrame) bool {
+	if BULLET_EXPLODING == meleeBullet.BlState {
+		return meleeBullet.FramesInBlState < meleeBullet.Bullet.ExplosionFrames
+	}
+	return (meleeBullet.BattleAttr.OriginatedRenderFrameId+meleeBullet.Bullet.StartupFrames+meleeBullet.Bullet.ActiveFrames > currRenderFrame.Id)
+}
+
+func IsFireballBulletActive(fireballBullet *FireballBullet, currRenderFrame *RoomDownsyncFrame) bool {
+	if BULLET_EXPLODING == fireballBullet.BlState {
+		return false
+	}
+	return (fireballBullet.BattleAttr.OriginatedRenderFrameId+fireballBullet.Bullet.StartupFrames < currRenderFrame.Id) && (fireballBullet.BattleAttr.OriginatedRenderFrameId+fireballBullet.Bullet.StartupFrames+fireballBullet.Bullet.ActiveFrames > currRenderFrame.Id)
+}
+
+func IsFireballBulletAlive(fireballBullet *FireballBullet, currRenderFrame *RoomDownsyncFrame) bool {
+	if BULLET_EXPLODING == fireballBullet.BlState {
+		return fireballBullet.FramesInBlState < fireballBullet.Bullet.ExplosionFrames
+	}
+	return (fireballBullet.BattleAttr.OriginatedRenderFrameId+fireballBullet.Bullet.StartupFrames+fireballBullet.Bullet.ActiveFrames > currRenderFrame.Id)
+}
+
 func isPolygonPairSeparatedByDir(a, b *resolv.ConvexPolygon, e resolv.Vector, result *SatResult) bool {
 	/*
 		[WARNING] This function is deliberately made private, it shouldn't be used alone (i.e. not along the norms of a polygon), otherwise the pushbacks calculated would be meaningless.
@@ -315,8 +363,8 @@ func isPolygonPairSeparatedByDir(a, b *resolv.ConvexPolygon, e resolv.Vector, re
 func WorldToVirtualGridPos(wx, wy float64) (int32, int32) {
 	// [WARNING] Introduces loss of precision!
 	// In JavaScript floating numbers suffer from seemingly non-deterministic arithmetics, and even if certain libs solved this issue by approaches such as fixed-point-number, they might not be used in other libs -- e.g. the "collision libs" we're interested in -- thus couldn't kill all pains.
-	var virtualGridX int32 = int32(math.Floor(wx * WORLD_TO_VIRTUAL_GRID_RATIO))
+	var virtualGridX int32 = int32(math.Round(wx * WORLD_TO_VIRTUAL_GRID_RATIO))
-	var virtualGridY int32 = int32(math.Floor(wy * WORLD_TO_VIRTUAL_GRID_RATIO))
+	var virtualGridY int32 = int32(math.Round(wy * WORLD_TO_VIRTUAL_GRID_RATIO))
 	return virtualGridX, virtualGridY
 }
 
@@ -345,9 +393,25 @@ func VirtualGridToPolygonColliderBLPos(vx, vy int32, halfBoundingW, halfBounding
 	return WorldToPolygonColliderBLPos(wx, wy, halfBoundingW, halfBoundingH, topPadding, bottomPadding, leftPadding, rightPadding, collisionSpaceOffsetX, collisionSpaceOffsetY)
 }
 
-func calcHardPushbacksNorms(joinIndex int32, playerCollider *resolv.Object, playerShape *resolv.ConvexPolygon, snapIntoPlatformOverlap float64, pEffPushback *Vec2D) *[]Vec2D {
+func calcHardPushbacksNorms(joinIndex int32, currPlayerDownsync, thatPlayerInNextFrame *PlayerDownsync, playerCollider *resolv.Object, playerShape *resolv.ConvexPolygon, snapIntoPlatformOverlap float64, pEffPushback *Vec2D) *[]Vec2D {
 	ret := make([]Vec2D, 0, 10) // no one would simultaneously have more than 5 hardPushbacks
-	collision := playerCollider.Check(0, 0)
+	virtualGripToWall := float64(0)
+	if ATK_CHARACTER_STATE_ONWALL == currPlayerDownsync.CharacterState && 0 == thatPlayerInNextFrame.VelX && currPlayerDownsync.DirX == thatPlayerInNextFrame.DirX {
+		/*
+		   I'm not sure whether this is a bug of "resolv_tailored" (maybe due to my changes), on the x-axis a playerCollider whose right edge reaches "1680.1" is not deemed collided with a side wall whose left edge is "1680.0", while the same extent of intersection is OK in y-axis.
+
+		   The workaround here is to grant a "virtualGripToWall" in x-axis to guarantee that if
+		   - "currPlayerDownsync" is on wall, and
+		   - "thatPlayerInNextFrame.VelX" is 0 (i.e. no proactive move against the wall), and
+		   - there's no change in player facing direction
+		*/
+		xfac := float64(1)
+		if 0 > thatPlayerInNextFrame.DirX {
+			xfac = -xfac
+		}
+		virtualGripToWall = xfac * float64(currPlayerDownsync.Speed) * VIRTUAL_GRID_TO_WORLD_RATIO
+	}
+	collision := playerCollider.Check(virtualGripToWall, 0)
 	if nil == collision {
 		return &ret
 	}
@@ -357,8 +421,7 @@ func calcHardPushbacksNorms(joinIndex int32, playerCollider *resolv.Object, play
 	for _, obj := range collision.Objects {
 		isBarrier := false
 		switch obj.Data.(type) {
-		case *PlayerDownsync:
+		case *PlayerDownsync, *MeleeBullet, *FireballBullet:
-		case *MeleeBullet, *FireballBullet:
 		default:
 			// By default it's a regular barrier, even if data is nil, note that Golang syntax of switch-case is kind of confusing, this "default" condition is met only if "!*PlayerDownsync && !*MeleeBullet && !*FireballBullet".
 			isBarrier = true
@@ -368,7 +431,7 @@ func calcHardPushbacksNorms(joinIndex int32, playerCollider *resolv.Object, play
 			continue
 		}
 		barrierShape := obj.Shape.(*resolv.ConvexPolygon)
-		overlapped, pushbackX, pushbackY, overlapResult := CalcPushbacks(0, 0, playerShape, barrierShape)
+		overlapped, pushbackX, pushbackY, overlapResult := calcPushbacks(0, 0, playerShape, barrierShape)
 		if !overlapped {
 			continue
 		}
@@ -419,13 +482,21 @@ func deriveOpPattern(currPlayerDownsync, thatPlayerInNextFrame *PlayerDownsync,
 		if decodedInput.BtnBLevel > prevBtnBLevel {
 			if _, existent := inAirSet[currPlayerDownsync.CharacterState]; !existent {
 				jumpedOrNot = true
+			} else if ATK_CHARACTER_STATE_ONWALL == currPlayerDownsync.CharacterState {
+				jumpedOrNot = true
 			}
 		}
 	}
 
 	patternId := PATTERN_ID_NO_OP
 	if decodedInput.BtnALevel > prevBtnALevel {
-		patternId = 1
+		if 0 > effDy {
+			patternId = 3
+		} else if 0 < effDy {
+			patternId = 2
+		} else {
+			patternId = 1
+		}
 	}
 
 	return patternId, jumpedOrNot, effDx, effDy
@@ -448,6 +519,7 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 			VelY:             currPlayerDownsync.VelY,
 			CharacterState:   currPlayerDownsync.CharacterState,
 			InAir:            true,
+			OnWall:           false,
 			Speed:            currPlayerDownsync.Speed,
 			BattleState:      currPlayerDownsync.BattleState,
 			Score:            currPlayerDownsync.Score,
@@ -461,6 +533,8 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 			ActiveSkillHit:   currPlayerDownsync.ActiveSkillHit,
 			FramesInvinsible: currPlayerDownsync.FramesInvinsible - 1,
 			ColliderRadius:   currPlayerDownsync.ColliderRadius,
+			OnWallNormX:      currPlayerDownsync.OnWallNormX,
+			OnWallNormY:      currPlayerDownsync.OnWallNormY,
 		}
 		if nextRenderFramePlayers[i].FramesToRecover < 0 {
 			nextRenderFramePlayers[i].FramesToRecover = 0
@@ -479,15 +553,11 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 	bulletLocalId := currRenderFrame.BulletLocalIdCounter
 	// 1. Process player inputs
 	for i, currPlayerDownsync := range currRenderFrame.PlayersArr {
-		jumpedOrNotList[i] = false
 		chConfig := chConfigsOrderedByJoinIndex[i]
 		thatPlayerInNextFrame := nextRenderFramePlayers[i]
 		patternId, jumpedOrNot, effDx, effDy := deriveOpPattern(currPlayerDownsync, thatPlayerInNextFrame, currRenderFrame, inputsBuffer)
 
-		if jumpedOrNot {
+		jumpedOrNotList[i] = jumpedOrNot
-			thatPlayerInNextFrame.VelY = int32(chConfig.JumpingInitVelY)
-			jumpedOrNotList[i] = true
-		}
 		joinIndex := currPlayerDownsync.JoinIndex
 		skillId := chConfig.SkillMapper(patternId, currPlayerDownsync)
 		if skillConfig, existent := skills[skillId]; existent {
@@ -504,40 +574,48 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 			switch v := skillConfig.Hits[thatPlayerInNextFrame.ActiveSkillHit].(type) {
 			case *MeleeBullet:
 				var newBullet MeleeBullet = *v // Copied primitive fields into an onstack variable
-				newBullet.BulletLocalId = bulletLocalId
+				newBullet.BattleAttr = &BulletBattleAttr{
-				bulletLocalId++
+					BulletLocalId:           bulletLocalId,
-				newBullet.OriginatedRenderFrameId = currRenderFrame.Id
+					OriginatedRenderFrameId: currRenderFrame.Id,
-				newBullet.OffenderJoinIndex = joinIndex
+					OffenderJoinIndex:       joinIndex,
-				nextRenderFrameMeleeBullets = append(nextRenderFrameMeleeBullets, &newBullet)
+					TeamId:                  currPlayerDownsync.BulletTeamId,
-				if NO_LOCK_VEL != v.SelfLockVelX {
-					hasLockVel = true
-					thatPlayerInNextFrame.VelX = xfac * v.SelfLockVelX
 				}
-				if NO_LOCK_VEL != v.SelfLockVelY {
+				bulletLocalId++
+				newBullet.BlState = BULLET_STARTUP
+				nextRenderFrameMeleeBullets = append(nextRenderFrameMeleeBullets, &newBullet)
+				if NO_LOCK_VEL != v.Bullet.SelfLockVelX {
 					hasLockVel = true
-					thatPlayerInNextFrame.VelY = v.SelfLockVelY
+					thatPlayerInNextFrame.VelX = xfac * v.Bullet.SelfLockVelX
+				}
+				if NO_LOCK_VEL != v.Bullet.SelfLockVelY {
+					hasLockVel = true
+					thatPlayerInNextFrame.VelY = v.Bullet.SelfLockVelY
 				}
 			case *FireballBullet:
 				var newBullet FireballBullet = *v // Copied primitive fields into an onstack variable
-				newBullet.BulletLocalId = bulletLocalId
+				newBullet.BattleAttr = &BulletBattleAttr{
-				bulletLocalId++
+					BulletLocalId:           bulletLocalId,
-				xfac := int32(1)
+					OriginatedRenderFrameId: currRenderFrame.Id,
-				if 0 > thatPlayerInNextFrame.DirX {
+					OffenderJoinIndex:       joinIndex,
-					xfac = -xfac
+					TeamId:                  currPlayerDownsync.BulletTeamId,
 				}
-				newBullet.VirtualGridX, newBullet.VirtualGridY = currPlayerDownsync.VirtualGridX+xfac*newBullet.HitboxOffsetX, currPlayerDownsync.VirtualGridY
+				bulletLocalId++
-				newBullet.OriginatedRenderFrameId = currRenderFrame.Id
+				newBullet.VirtualGridX, newBullet.VirtualGridY = currPlayerDownsync.VirtualGridX+xfac*newBullet.Bullet.HitboxOffsetX, currPlayerDownsync.VirtualGridY+newBullet.Bullet.HitboxOffsetY
-				newBullet.OffenderJoinIndex = joinIndex
+				newBullet.DirX = xfac
+				newBullet.DirY = 0
 				newBullet.VelX = newBullet.Speed * xfac
 				newBullet.VelY = 0
+
+				newBullet.BlState = BULLET_STARTUP
 				nextRenderFrameFireballBullets = append(nextRenderFrameFireballBullets, &newBullet)
-				if NO_LOCK_VEL != v.SelfLockVelX {
+				//fmt.Printf("Created new fireball @currRenderFrame.Id=%d, %p, bulletLocalId=%d, virtualGridX=%d, virtualGridY=%d, offenderVpos=(%d,%d)\n", currRenderFrame.Id, &newBullet, bulletLocalId, newBullet.VirtualGridX, newBullet.VirtualGridY, currPlayerDownsync.VirtualGridX, currPlayerDownsync.VirtualGridY)
+				if NO_LOCK_VEL != v.Bullet.SelfLockVelX {
 					hasLockVel = true
-					thatPlayerInNextFrame.VelX = xfac * v.SelfLockVelX
+					thatPlayerInNextFrame.VelX = xfac * v.Bullet.SelfLockVelX
 				}
-				if NO_LOCK_VEL != v.SelfLockVelY {
+				if NO_LOCK_VEL != v.Bullet.SelfLockVelY {
 					hasLockVel = true
-					thatPlayerInNextFrame.VelY = v.SelfLockVelY
+					thatPlayerInNextFrame.VelY = v.Bullet.SelfLockVelY
 				}
 			}
 
@@ -549,9 +627,19 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 		}
 
 		if 0 == currPlayerDownsync.FramesToRecover {
-			if 0 != effDx || 0 != effDy {
+			if 0 != effDx {
-				thatPlayerInNextFrame.DirX, thatPlayerInNextFrame.DirY = effDx, effDy
+				xfac := int32(1)
-				thatPlayerInNextFrame.VelX = effDx * currPlayerDownsync.Speed
+				if 0 > effDx {
+					xfac = -xfac
+				}
+				thatPlayerInNextFrame.DirX = effDx
+				thatPlayerInNextFrame.DirY = effDy
+
+				thatPlayerInNextFrame.VelX = xfac * currPlayerDownsync.Speed
+				if intAbs(thatPlayerInNextFrame.VelX) < intAbs(currPlayerDownsync.VelX) {
+					// Wall jumping
+					thatPlayerInNextFrame.VelX = xfac * intAbs(currPlayerDownsync.VelX)
+				}
 				thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_WALKING
 			} else {
 				thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_IDLE1
@@ -565,12 +653,31 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 	for i, currPlayerDownsync := range currRenderFrame.PlayersArr {
 		joinIndex := currPlayerDownsync.JoinIndex
 		effPushbacks[joinIndex-1].X, effPushbacks[joinIndex-1].Y = float64(0), float64(0)
+		thatPlayerInNextFrame := nextRenderFramePlayers[i]
 
 		chConfig := chConfigsOrderedByJoinIndex[i]
 		// Reset playerCollider position from the "virtual grid position"
 		newVx, newVy := currPlayerDownsync.VirtualGridX+currPlayerDownsync.VelX, currPlayerDownsync.VirtualGridY+currPlayerDownsync.VelY
 		if jumpedOrNotList[i] {
-			newVy += chConfig.JumpingInitVelY // Immediately gets out of any snapping
+			// We haven't proceeded with "OnWall" calculation for "thatPlayerInNextFrame", thus use "currPlayerDownsync.OnWall" for checking
+			if ATK_CHARACTER_STATE_ONWALL == currPlayerDownsync.CharacterState {
+				if 0 < currPlayerDownsync.VelX*currPlayerDownsync.OnWallNormX {
+					newVx -= currPlayerDownsync.VelX // Cancel the alleged horizontal movement pointing to same direction of wall inward norm first
+				}
+				xfac := int32(-1)
+				if 0 > currPlayerDownsync.OnWallNormX {
+					// Always jump to the opposite direction of wall inward norm
+					xfac = -xfac
+				}
+				newVx += xfac * chConfig.WallJumpingInitVelX
+				newVy += chConfig.WallJumpingInitVelY
+				thatPlayerInNextFrame.VelX = int32(xfac * chConfig.WallJumpingInitVelX)
+				thatPlayerInNextFrame.VelY = int32(chConfig.WallJumpingInitVelY)
+				thatPlayerInNextFrame.FramesToRecover = chConfig.WallJumpingFramesToRecover
+			} else {
+				thatPlayerInNextFrame.VelY = int32(chConfig.JumpingInitVelY)
+				newVy += chConfig.JumpingInitVelY // Immediately gets out of any snapping
+			}
 		}
 
 		wx, wy := VirtualGridToWorldPos(newVx, newVy)
@@ -578,7 +685,7 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 		switch currPlayerDownsync.CharacterState {
 		case ATK_CHARACTER_STATE_LAY_DOWN1:
 			colliderWidth, colliderHeight = currPlayerDownsync.ColliderRadius*4, currPlayerDownsync.ColliderRadius*2
-		case ATK_CHARACTER_STATE_BLOWN_UP1, ATK_CHARACTER_STATE_INAIR_IDLE1_NO_JUMP, ATK_CHARACTER_STATE_INAIR_IDLE1_BY_JUMP:
+		case ATK_CHARACTER_STATE_BLOWN_UP1, ATK_CHARACTER_STATE_INAIR_IDLE1_NO_JUMP, ATK_CHARACTER_STATE_INAIR_IDLE1_BY_JUMP, ATK_CHARACTER_STATE_ONWALL:
 			colliderWidth, colliderHeight = currPlayerDownsync.ColliderRadius*2, currPlayerDownsync.ColliderRadius*2
 		}
 
@@ -590,41 +697,80 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 		// Add to collision system
 		collisionSys.Add(playerCollider)
 
-		thatPlayerInNextFrame := nextRenderFramePlayers[i]
 		if currPlayerDownsync.InAir {
-			thatPlayerInNextFrame.VelX += GRAVITY_X
+			if ATK_CHARACTER_STATE_ONWALL == currPlayerDownsync.CharacterState && !jumpedOrNotList[i] {
-			thatPlayerInNextFrame.VelY += GRAVITY_Y
+				thatPlayerInNextFrame.VelX += GRAVITY_X
+				thatPlayerInNextFrame.VelY = chConfig.WallSlidingVelY
+			} else {
+				thatPlayerInNextFrame.VelX += GRAVITY_X
+				thatPlayerInNextFrame.VelY += GRAVITY_Y
+			}
 		}
 	}
 
 	// 3. Add bullet colliders into collision system
-	bulletColliders := make([]*resolv.Object, 0, len(currRenderFrame.MeleeBullets)) // Will all be removed at the end of this function due to the need for being rollback-compatible
-	for _, meleeBullet := range currRenderFrame.MeleeBullets {
-		if (meleeBullet.OriginatedRenderFrameId+meleeBullet.StartupFrames <= currRenderFrame.Id) && (meleeBullet.OriginatedRenderFrameId+meleeBullet.StartupFrames+meleeBullet.ActiveFrames > currRenderFrame.Id) {
-			offender := currRenderFrame.PlayersArr[meleeBullet.OffenderJoinIndex-1]
 
-			xfac := int32(1) // By now, straight Punch offset doesn't respect "y-axis"
+	// [WARNING] For rollback compatibility, static data of "BulletConfig" & "BattleAttr(static since instantiated)" can just be copies of the pointers in "RenderFrameBuffer", however, FireballBullets movement data as well as bullet animation data must be copies of instances for each RenderFrame!
-			if 0 > offender.DirX {
+	bulletColliders := make([]*resolv.Object, 0, len(currRenderFrame.MeleeBullets)) // Will all be removed at the end of this function due to the need for being rollback-compatible
-				xfac = -xfac
+	for _, prevMelee := range currRenderFrame.MeleeBullets {
+		meleeBullet := &MeleeBullet{
+			Bullet:          prevMelee.Bullet,
+			BattleAttr:      prevMelee.BattleAttr,
+			FramesInBlState: prevMelee.FramesInBlState + 1,
+			BlState:         prevMelee.BlState,
+		}
+		if IsMeleeBulletAlive(meleeBullet, currRenderFrame) {
+			if IsMeleeBulletActive(meleeBullet, currRenderFrame) {
+				offender := currRenderFrame.PlayersArr[meleeBullet.BattleAttr.OffenderJoinIndex-1]
+
+				xfac := int32(1) // By now, straight Punch offset doesn't respect "y-axis"
+				if 0 > offender.DirX {
+					xfac = -xfac
+				}
+				bulletWx, bulletWy := VirtualGridToWorldPos(offender.VirtualGridX+xfac*meleeBullet.Bullet.HitboxOffsetX, offender.VirtualGridY)
+				hitboxSizeWx, hitboxSizeWy := VirtualGridToWorldPos(meleeBullet.Bullet.HitboxSizeX, meleeBullet.Bullet.HitboxSizeY)
+				newBulletCollider := GenerateRectCollider(bulletWx, bulletWy, hitboxSizeWx, hitboxSizeWy, SNAP_INTO_PLATFORM_OVERLAP, SNAP_INTO_PLATFORM_OVERLAP, SNAP_INTO_PLATFORM_OVERLAP, SNAP_INTO_PLATFORM_OVERLAP, collisionSpaceOffsetX, collisionSpaceOffsetY, meleeBullet, "MeleeBullet")
+				collisionSys.Add(newBulletCollider)
+				bulletColliders = append(bulletColliders, newBulletCollider)
+				meleeBullet.BlState = BULLET_ACTIVE
+				if meleeBullet.BlState != prevMelee.BlState {
+					meleeBullet.FramesInBlState = 0
+				}
 			}
-			bulletWx, bulletWy := VirtualGridToWorldPos(offender.VirtualGridX+xfac*meleeBullet.HitboxOffsetX, offender.VirtualGridY)
-			hitboxSizeWx, hitboxSizeWy := VirtualGridToWorldPos(meleeBullet.HitboxSizeX, meleeBullet.HitboxSizeY)
-			newBulletCollider := GenerateRectCollider(bulletWx, bulletWy, hitboxSizeWx, hitboxSizeWy, SNAP_INTO_PLATFORM_OVERLAP, SNAP_INTO_PLATFORM_OVERLAP, SNAP_INTO_PLATFORM_OVERLAP, SNAP_INTO_PLATFORM_OVERLAP, collisionSpaceOffsetX, collisionSpaceOffsetY, meleeBullet, "MeleeBullet")
-			collisionSys.Add(newBulletCollider)
-			bulletColliders = append(bulletColliders, newBulletCollider)
-		} else if meleeBullet.OriginatedRenderFrameId+meleeBullet.StartupFrames+meleeBullet.ActiveFrames > currRenderFrame.Id {
 			nextRenderFrameMeleeBullets = append(nextRenderFrameMeleeBullets, meleeBullet)
 		}
 	}
 
-	for _, fireballBullet := range currRenderFrame.FireballBullets {
+	for _, prevFireball := range currRenderFrame.FireballBullets {
-		if (fireballBullet.OriginatedRenderFrameId+fireballBullet.StartupFrames < currRenderFrame.Id) && (fireballBullet.OriginatedRenderFrameId+fireballBullet.StartupFrames+fireballBullet.ActiveFrames > currRenderFrame.Id) {
+		fireballBullet := &FireballBullet{
-			bulletWx, bulletWy := VirtualGridToWorldPos(fireballBullet.VirtualGridX, fireballBullet.VirtualGridY)
+			VirtualGridX:    prevFireball.VirtualGridX,
-			hitboxSizeWx, hitboxSizeWy := VirtualGridToWorldPos(fireballBullet.HitboxSizeX, fireballBullet.HitboxSizeY)
+			VirtualGridY:    prevFireball.VirtualGridY,
-			newBulletCollider := GenerateRectCollider(bulletWx, bulletWy, hitboxSizeWx, hitboxSizeWy, SNAP_INTO_PLATFORM_OVERLAP, SNAP_INTO_PLATFORM_OVERLAP, SNAP_INTO_PLATFORM_OVERLAP, SNAP_INTO_PLATFORM_OVERLAP, collisionSpaceOffsetX, collisionSpaceOffsetY, fireballBullet, "FireballBullet")
+			DirX:            prevFireball.DirX,
-			collisionSys.Add(newBulletCollider)
+			DirY:            prevFireball.DirY,
-			bulletColliders = append(bulletColliders, newBulletCollider)
+			VelX:            prevFireball.VelX,
-		} else if fireballBullet.OriginatedRenderFrameId+fireballBullet.StartupFrames+fireballBullet.ActiveFrames > currRenderFrame.Id {
+			VelY:            prevFireball.VelY,
+			Speed:           prevFireball.Speed,
+			Bullet:          prevFireball.Bullet,
+			BattleAttr:      prevFireball.BattleAttr,
+			FramesInBlState: prevFireball.FramesInBlState + 1,
+			BlState:         prevFireball.BlState,
+		}
+		if IsFireballBulletAlive(fireballBullet, currRenderFrame) {
+			if IsFireballBulletActive(fireballBullet, currRenderFrame) {
+				bulletWx, bulletWy := VirtualGridToWorldPos(fireballBullet.VirtualGridX, fireballBullet.VirtualGridY)
+				hitboxSizeWx, hitboxSizeWy := VirtualGridToWorldPos(fireballBullet.Bullet.HitboxSizeX, fireballBullet.Bullet.HitboxSizeY)
+				newBulletCollider := GenerateRectCollider(bulletWx, bulletWy, hitboxSizeWx, hitboxSizeWy, SNAP_INTO_PLATFORM_OVERLAP, SNAP_INTO_PLATFORM_OVERLAP, SNAP_INTO_PLATFORM_OVERLAP, SNAP_INTO_PLATFORM_OVERLAP, collisionSpaceOffsetX, collisionSpaceOffsetY, fireballBullet, "FireballBullet")
+				collisionSys.Add(newBulletCollider)
+				bulletColliders = append(bulletColliders, newBulletCollider)
+				fireballBullet.BlState = BULLET_ACTIVE
+				if fireballBullet.BlState != prevFireball.BlState {
+					fireballBullet.FramesInBlState = 0
+				}
+				fireballBullet.VirtualGridX, fireballBullet.VirtualGridY = fireballBullet.VirtualGridX+fireballBullet.VelX, fireballBullet.VirtualGridY+fireballBullet.VelY
+				//fmt.Printf("Pushing active fireball to next frame @currRenderFrame.Id=%d, bulletLocalId=%d, virtualGridX=%d, virtualGridY=%d, blState=%d\n", currRenderFrame.Id, fireballBullet.BattleAttr.BulletLocalId, fireballBullet.VirtualGridX, fireballBullet.VirtualGridY, fireballBullet.BlState)
+			} else {
+				//fmt.Printf("Pushing non-active fireball to next frame @currRenderFrame.Id=%d, bulletLocalId=%d, virtualGridX=%d, virtualGridY=%d, blState=%d\n", currRenderFrame.Id, fireballBullet.BattleAttr.BulletLocalId, fireballBullet.VirtualGridX, fireballBullet.VirtualGridY, fireballBullet.BlState)
+			}
 			nextRenderFrameFireballBullets = append(nextRenderFrameFireballBullets, fireballBullet)
 		}
 	}
@@ -634,8 +780,8 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 		joinIndex := currPlayerDownsync.JoinIndex
 		playerCollider := playerColliders[i]
 		playerShape := playerCollider.Shape.(*resolv.ConvexPolygon)
-		hardPushbackNorms[joinIndex-1] = calcHardPushbacksNorms(joinIndex, playerCollider, playerShape, SNAP_INTO_PLATFORM_OVERLAP, &(effPushbacks[joinIndex-1]))
 		thatPlayerInNextFrame := nextRenderFramePlayers[i]
+		hardPushbackNorms[joinIndex-1] = calcHardPushbacksNorms(joinIndex, currPlayerDownsync, thatPlayerInNextFrame, playerCollider, playerShape, SNAP_INTO_PLATFORM_OVERLAP, &(effPushbacks[joinIndex-1]))
 		chConfig := chConfigsOrderedByJoinIndex[i]
 		landedOnGravityPushback := false
 
@@ -656,7 +802,7 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 					continue
 				}
 				bShape := obj.Shape.(*resolv.ConvexPolygon)
-				overlapped, pushbackX, pushbackY, overlapResult := CalcPushbacks(0, 0, playerShape, bShape)
+				overlapped, pushbackX, pushbackY, overlapResult := calcPushbacks(0, 0, playerShape, bShape)
 				if !overlapped {
 					continue
 				}
@@ -684,24 +830,27 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 		}
 		if landedOnGravityPushback {
 			thatPlayerInNextFrame.InAir = false
-			if currPlayerDownsync.InAir && 0 >= currPlayerDownsync.VelY {
+			fallStopping := (currPlayerDownsync.InAir && 0 >= currPlayerDownsync.VelY)
-				// fallStopping
+			if fallStopping {
 				thatPlayerInNextFrame.VelY = 0
 				thatPlayerInNextFrame.VelX = 0
-				if _, existent := nonAttackingSet[thatPlayerInNextFrame.CharacterState]; existent {
+				if ATK_CHARACTER_STATE_BLOWN_UP1 == thatPlayerInNextFrame.CharacterState {
-					if ATK_CHARACTER_STATE_BLOWN_UP1 == thatPlayerInNextFrame.CharacterState {
+					thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_LAY_DOWN1
-						thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_LAY_DOWN1
+					thatPlayerInNextFrame.FramesToRecover = chConfig.LayDownFramesToRecover
-						thatPlayerInNextFrame.FramesToRecover = chConfig.LayDownFramesToRecover
+				} else {
-					} else {
+					switch currPlayerDownsync.CharacterState {
+					case ATK_CHARACTER_STATE_BLOWN_UP1, ATK_CHARACTER_STATE_INAIR_IDLE1_NO_JUMP, ATK_CHARACTER_STATE_INAIR_IDLE1_BY_JUMP, ATK_CHARACTER_STATE_ONWALL:
+						// [WARNING] To prevent bouncing due to abrupt change of collider shape, it's important that we check "currPlayerDownsync" instead of "thatPlayerInNextFrame" here!
 						halfColliderWidthDiff, halfColliderHeightDiff := int32(0), currPlayerDownsync.ColliderRadius
 						_, halfColliderWorldHeightDiff := VirtualGridToWorldPos(halfColliderWidthDiff, halfColliderHeightDiff)
-						effPushbacks[joinIndex-1].Y -= halfColliderWorldHeightDiff // To prevent bouncing due to abrupt change of collider shape
+						effPushbacks[joinIndex-1].Y -= halfColliderWorldHeightDiff
-						thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_IDLE1
 					}
+					thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_IDLE1
+					thatPlayerInNextFrame.FramesToRecover = 0
 				}
 			} else {
+				// landedOnGravityPushback not fallStopping, could be in LayDown or GetUp
 				if _, existent := nonAttackingSet[thatPlayerInNextFrame.CharacterState]; existent {
-					// not fallStopping, could be in LayDown or GetUp
 					if ATK_CHARACTER_STATE_LAY_DOWN1 == thatPlayerInNextFrame.CharacterState {
 						if 0 == thatPlayerInNextFrame.FramesToRecover {
 							thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_GET_UP1
@@ -716,30 +865,62 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 				}
 			}
 		}
+
+		if chConfig.OnWallEnabled {
+			if thatPlayerInNextFrame.InAir {
+				// [WARNING] Sticking to wall MUST BE based on "InAir", otherwise we would get gravity reduction from ground up incorrectly!
+				if _, existent := noOpSet[currPlayerDownsync.CharacterState]; !existent {
+					// [WARNING] Sticking to wall could only be triggered by proactive player input
+					for _, hardPushbackNorm := range *hardPushbackNorms[joinIndex-1] {
+						normAlignmentWithHorizon1 := (hardPushbackNorm.X*float64(1.0) + hardPushbackNorm.Y*float64(0.0))
+						normAlignmentWithHorizon2 := (hardPushbackNorm.X*float64(-1.0) + hardPushbackNorm.Y*float64(0.0))
+						if VERTICAL_PLATFORM_THRESHOLD < normAlignmentWithHorizon1 {
+							thatPlayerInNextFrame.OnWall = true
+							thatPlayerInNextFrame.OnWallNormX, thatPlayerInNextFrame.OnWallNormY = int32(hardPushbackNorm.X), int32(hardPushbackNorm.Y)
+							break
+						}
+						if VERTICAL_PLATFORM_THRESHOLD < normAlignmentWithHorizon2 {
+							thatPlayerInNextFrame.OnWall = true
+							thatPlayerInNextFrame.OnWallNormX, thatPlayerInNextFrame.OnWallNormY = int32(hardPushbackNorm.X), int32(hardPushbackNorm.Y)
+							break
+						}
+					}
+
+					if !currPlayerDownsync.OnWall && thatPlayerInNextFrame.OnWall {
+						// To avoid mysterious climbing up the wall after sticking on it
+						thatPlayerInNextFrame.VelY = 0
+					}
+				}
+			}
+			if !thatPlayerInNextFrame.OnWall {
+				thatPlayerInNextFrame.OnWallNormX, thatPlayerInNextFrame.OnWallNormY = 0, 0
+			}
+		}
+
 	}
 
 	// 5. Check bullet-anything collisions
 	for _, bulletCollider := range bulletColliders {
 		collision := bulletCollider.Check(0, 0)
 		bulletCollider.Space.Remove(bulletCollider) // Make sure that the bulletCollider is always removed for each renderFrame
-		addToNextRenderFrame := true
+		exploded := false
 		if nil != collision {
 			switch v := bulletCollider.Data.(type) {
 			case *MeleeBullet:
 				bulletShape := bulletCollider.Shape.(*resolv.ConvexPolygon)
-				offender := currRenderFrame.PlayersArr[v.OffenderJoinIndex-1]
+				offender := currRenderFrame.PlayersArr[v.BattleAttr.OffenderJoinIndex-1]
 				for _, obj := range collision.Objects {
 					defenderShape := obj.Shape.(*resolv.ConvexPolygon)
 					switch t := obj.Data.(type) {
 					case *PlayerDownsync:
-						if v.OffenderJoinIndex == t.JoinIndex {
+						if v.BattleAttr.OffenderJoinIndex == t.JoinIndex {
 							continue
 						}
-						overlapped, _, _, _ := CalcPushbacks(0, 0, bulletShape, defenderShape)
+						overlapped, _, _, _ := calcPushbacks(0, 0, bulletShape, defenderShape)
 						if !overlapped {
 							continue
 						}
-						addToNextRenderFrame = false
+						exploded = true
 						if _, existent := invinsibleSet[t.CharacterState]; existent {
 							continue
 						}
@@ -750,38 +931,36 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 						if 0 > offender.DirX {
 							xfac = -xfac
 						}
-						pushbackVelX, pushbackVelY := xfac*v.PushbackVelX, v.PushbackVelY
+						pushbackVelX, pushbackVelY := xfac*v.Bullet.PushbackVelX, v.Bullet.PushbackVelY
 						atkedPlayerInNextFrame := nextRenderFramePlayers[t.JoinIndex-1]
 						atkedPlayerInNextFrame.VelX = pushbackVelX
 						atkedPlayerInNextFrame.VelY = pushbackVelY
-						if v.BlowUp {
+						if v.Bullet.BlowUp {
 							atkedPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_BLOWN_UP1
 						} else {
 							atkedPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_ATKED1
 						}
 						oldFramesToRecover := nextRenderFramePlayers[t.JoinIndex-1].FramesToRecover
-						if v.HitStunFrames > oldFramesToRecover {
+						if v.Bullet.HitStunFrames > oldFramesToRecover {
-							atkedPlayerInNextFrame.FramesToRecover = v.HitStunFrames
+							atkedPlayerInNextFrame.FramesToRecover = v.Bullet.HitStunFrames
 						}
-					default:
-						addToNextRenderFrame = false
 					}
 				}
 			case *FireballBullet:
 				bulletShape := bulletCollider.Shape.(*resolv.ConvexPolygon)
-				offender := currRenderFrame.PlayersArr[v.OffenderJoinIndex-1]
+				offender := currRenderFrame.PlayersArr[v.BattleAttr.OffenderJoinIndex-1]
 				for _, obj := range collision.Objects {
 					defenderShape := obj.Shape.(*resolv.ConvexPolygon)
 					switch t := obj.Data.(type) {
 					case *PlayerDownsync:
-						if v.OffenderJoinIndex == t.JoinIndex {
+						if v.BattleAttr.OffenderJoinIndex == t.JoinIndex {
 							continue
 						}
-						overlapped, _, _, _ := CalcPushbacks(0, 0, bulletShape, defenderShape)
+						overlapped, _, _, _ := calcPushbacks(0, 0, bulletShape, defenderShape)
 						if !overlapped {
 							continue
 						}
-						addToNextRenderFrame = false
+						exploded = true
 						if _, existent := invinsibleSet[t.CharacterState]; existent {
 							continue
 						}
@@ -792,32 +971,35 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 						if 0 > offender.DirX {
 							xfac = -xfac
 						}
-						pushbackVelX, pushbackVelY := xfac*v.PushbackVelX, v.PushbackVelY
+						pushbackVelX, pushbackVelY := xfac*v.Bullet.PushbackVelX, v.Bullet.PushbackVelY
 						atkedPlayerInNextFrame := nextRenderFramePlayers[t.JoinIndex-1]
 						atkedPlayerInNextFrame.VelX = pushbackVelX
 						atkedPlayerInNextFrame.VelY = pushbackVelY
-						if v.BlowUp {
+						if v.Bullet.BlowUp {
 							atkedPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_BLOWN_UP1
 						} else {
 							atkedPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_ATKED1
 						}
 						oldFramesToRecover := nextRenderFramePlayers[t.JoinIndex-1].FramesToRecover
-						if v.HitStunFrames > oldFramesToRecover {
+						if v.Bullet.HitStunFrames > oldFramesToRecover {
-							atkedPlayerInNextFrame.FramesToRecover = v.HitStunFrames
+							atkedPlayerInNextFrame.FramesToRecover = v.Bullet.HitStunFrames
 						}
 					default:
-						addToNextRenderFrame = false
+						exploded = true
 					}
 				}
 			}
 		}
-		if addToNextRenderFrame {
+		if exploded {
 			switch v := bulletCollider.Data.(type) {
 			case *MeleeBullet:
-				nextRenderFrameMeleeBullets = append(nextRenderFrameMeleeBullets, v)
+				v.BlState = BULLET_EXPLODING
+				v.FramesInBlState = 0
+				//fmt.Printf("melee exploded @currRenderFrame.Id=%d, bulletLocalId=%d, blState=%d\n", currRenderFrame.Id, v.BattleAttr.BulletLocalId, v.BlState)
 			case *FireballBullet:
-				v.VirtualGridX, v.VirtualGridY = v.VirtualGridX+v.VelX, v.VirtualGridY+v.VelY
+				v.BlState = BULLET_EXPLODING
-				nextRenderFrameFireballBullets = append(nextRenderFrameFireballBullets, v)
+				v.FramesInBlState = 0
+				//fmt.Printf("fireball exploded @currRenderFrame.Id=%d, bulletLocalId=%d, virtualGridX=%d, virtualGridY=%d, blState=%d\n", currRenderFrame.Id, v.BattleAttr.BulletLocalId, v.VirtualGridX, v.VirtualGridY, v.BlState)
 			}
 		}
 	}
@@ -835,7 +1017,9 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 			oldNextCharacterState := thatPlayerInNextFrame.CharacterState
 			switch oldNextCharacterState {
 			case ATK_CHARACTER_STATE_IDLE1, ATK_CHARACTER_STATE_WALKING:
-				if jumpedOrNotList[i] || ATK_CHARACTER_STATE_INAIR_IDLE1_BY_JUMP == currPlayerDownsync.CharacterState {
+				if thatPlayerInNextFrame.OnWall {
+					thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_ONWALL
+				} else if jumpedOrNotList[i] || ATK_CHARACTER_STATE_INAIR_IDLE1_BY_JUMP == currPlayerDownsync.CharacterState {
 					thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_INAIR_IDLE1_BY_JUMP
 				} else {
 					thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_INAIR_IDLE1_NO_JUMP
@@ -865,10 +1049,11 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 	}
 
 	return &RoomDownsyncFrame{
-		Id:              currRenderFrame.Id + 1,
+		Id:                   currRenderFrame.Id + 1,
-		PlayersArr:      nextRenderFramePlayers,
+		PlayersArr:           nextRenderFramePlayers,
-		MeleeBullets:    nextRenderFrameMeleeBullets,
+		BulletLocalIdCounter: bulletLocalId,
-		FireballBullets: nextRenderFrameFireballBullets,
+		MeleeBullets:         nextRenderFrameMeleeBullets,
+		FireballBullets:      nextRenderFrameFireballBullets,
 	}
 }
 
@@ -949,3 +1134,82 @@ func AlignPolygon2DToBoundingBox(input *Polygon2D) *Polygon2D {
 
 	return output
 }
+
+func NewMeleeBullet(bulletLocalId, originatedRenderFrameId, offenderJoinIndex, startupFrames, cancellableStFrame, cancellableEdFrame, activeFrames, hitStunFrames, blockStunFrames, pushbackVelX, pushbackVelY, damage, selfLockVelX, selfLockVelY, hitboxOffsetX, hitboxOffsetY, hitboxSizeX, hitboxSizeY int32, blowUp bool, teamId, blState, framesInBlState, explosionFrames, speciesId int32) *MeleeBullet {
+	return &MeleeBullet{
+		BlState:         blState,
+		FramesInBlState: framesInBlState,
+		BattleAttr: &BulletBattleAttr{
+			BulletLocalId:           bulletLocalId,
+			OriginatedRenderFrameId: originatedRenderFrameId,
+			OffenderJoinIndex:       offenderJoinIndex,
+			TeamId:                  teamId,
+		},
+		Bullet: &BulletConfig{
+			StartupFrames:      startupFrames,
+			CancellableStFrame: cancellableStFrame,
+			CancellableEdFrame: cancellableEdFrame,
+			ActiveFrames:       activeFrames,
+
+			HitStunFrames:   hitStunFrames,
+			BlockStunFrames: blockStunFrames,
+			PushbackVelX:    pushbackVelX,
+			PushbackVelY:    pushbackVelY,
+			Damage:          damage,
+
+			SelfLockVelX: selfLockVelX,
+			SelfLockVelY: selfLockVelY,
+
+			HitboxOffsetX: hitboxOffsetX,
+			HitboxOffsetY: hitboxOffsetY,
+			HitboxSizeX:   hitboxSizeX,
+			HitboxSizeY:   hitboxSizeY,
+
+			BlowUp:          blowUp,
+			ExplosionFrames: explosionFrames,
+			SpeciesId:       speciesId,
+		},
+	}
+}
+
+func NewFireballBullet(bulletLocalId, originatedRenderFrameId, offenderJoinIndex, startupFrames, cancellableStFrame, cancellableEdFrame, activeFrames, hitStunFrames, blockStunFrames, pushbackVelX, pushbackVelY, damage, selfLockVelX, selfLockVelY, hitboxOffsetX, hitboxOffsetY, hitboxSizeX, hitboxSizeY int32, blowUp bool, teamId int32, virtualGridX, virtualGridY, dirX, dirY, velX, velY, speed, blState, framesInBlState, explosionFrames, speciesId int32) *FireballBullet {
+	return &FireballBullet{
+		VirtualGridX: virtualGridX,
+		VirtualGridY: virtualGridY,
+		DirX:         dirX,
+		DirY:         dirY,
+		VelX:         velX,
+		VelY:         velY,
+		Speed:        speed,
+		BattleAttr: &BulletBattleAttr{
+			BulletLocalId:           bulletLocalId,
+			OriginatedRenderFrameId: originatedRenderFrameId,
+			OffenderJoinIndex:       offenderJoinIndex,
+			TeamId:                  teamId,
+		},
+		Bullet: &BulletConfig{
+			StartupFrames:      startupFrames,
+			CancellableStFrame: cancellableStFrame,
+			CancellableEdFrame: cancellableEdFrame,
+			ActiveFrames:       activeFrames,
+
+			HitStunFrames:   hitStunFrames,
+			BlockStunFrames: blockStunFrames,
+			PushbackVelX:    pushbackVelX,
+			PushbackVelY:    pushbackVelY,
+			Damage:          damage,
+
+			SelfLockVelX: selfLockVelX,
+			SelfLockVelY: selfLockVelY,
+
+			HitboxOffsetX: hitboxOffsetX,
+			HitboxOffsetY: hitboxOffsetY,
+			HitboxSizeX:   hitboxSizeX,
+			HitboxSizeY:   hitboxSizeY,
+
+			BlowUp:          blowUp,
+			ExplosionFrames: explosionFrames,
+			SpeciesId:       speciesId,
+		},
+	}
+}

jsexport/battle/characterConfig.go

@@ -18,6 +18,13 @@ type CharacterConfig struct {
 	Speed           int32
 	JumpingInitVelY int32
 
+	DashingEnabled             bool
+	OnWallEnabled              bool
+	WallJumpingFramesToRecover int32
+	WallJumpingInitVelX        int32
+	WallJumpingInitVelY        int32
+	WallSlidingVelY            int32
+
 	SkillMapper SkillMapperType
 }
 
@@ -35,9 +42,12 @@ var Characters = map[int]*CharacterConfig{
 		GetUpInvinsibleFrames: int32(10),
 		GetUpFramesToRecover:  int32(27),
 
-		Speed:           int32(float64(1.2) * WORLD_TO_VIRTUAL_GRID_RATIO),
+		Speed:           int32(float64(3.0) * WORLD_TO_VIRTUAL_GRID_RATIO),
 		JumpingInitVelY: int32(float64(8) * WORLD_TO_VIRTUAL_GRID_RATIO),
 
+		DashingEnabled: false,
+		OnWallEnabled:  false,
+
 		SkillMapper: func(patternId int, currPlayerDownsync *PlayerDownsync) int {
 			if 1 == patternId {
 				if 0 == currPlayerDownsync.FramesToRecover {
@@ -51,8 +61,8 @@ var Characters = map[int]*CharacterConfig{
 					if skillConfig, existent1 := skills[int(currPlayerDownsync.ActiveSkillId)]; existent1 {
 						switch v := skillConfig.Hits[currPlayerDownsync.ActiveSkillHit].(type) {
 						case *MeleeBullet:
-							if v.CancellableStFrame <= currPlayerDownsync.FramesInChState && currPlayerDownsync.FramesInChState < v.CancellableEdFrame {
+							if v.Bullet.CancellableStFrame <= currPlayerDownsync.FramesInChState && currPlayerDownsync.FramesInChState < v.Bullet.CancellableEdFrame {
-								if nextSkillId, existent2 := v.CancelTransit[patternId]; existent2 {
+								if nextSkillId, existent2 := v.Bullet.CancelTransit[patternId]; existent2 {
 									return nextSkillId
 								}
 							}
@@ -78,9 +88,16 @@ var Characters = map[int]*CharacterConfig{
 		GetUpInvinsibleFrames: int32(10),
 		GetUpFramesToRecover:  int32(27),
 
-		Speed:           int32(float64(1.4) * WORLD_TO_VIRTUAL_GRID_RATIO),
+		Speed:           int32(float64(4.0) * WORLD_TO_VIRTUAL_GRID_RATIO),
 		JumpingInitVelY: int32(float64(7.5) * WORLD_TO_VIRTUAL_GRID_RATIO),
 
+		DashingEnabled:             true,
+		OnWallEnabled:              true,
+		WallJumpingFramesToRecover: int32(9),                                          // 8 would be the minimum for an avg human
+		WallJumpingInitVelX:        int32(float64(2.5) * WORLD_TO_VIRTUAL_GRID_RATIO), // Default is "appeared facing right", but actually holding ctrl against left
+		WallJumpingInitVelY:        int32(float64(7) * WORLD_TO_VIRTUAL_GRID_RATIO),
+		WallSlidingVelY:            int32(float64(-1) * WORLD_TO_VIRTUAL_GRID_RATIO),
+
 		SkillMapper: func(patternId int, currPlayerDownsync *PlayerDownsync) int {
 			if 1 == patternId {
 				if 0 == currPlayerDownsync.FramesToRecover {
@@ -94,8 +111,8 @@ var Characters = map[int]*CharacterConfig{
 					if skillConfig, existent1 := skills[int(currPlayerDownsync.ActiveSkillId)]; existent1 {
 						switch v := skillConfig.Hits[currPlayerDownsync.ActiveSkillHit].(type) {
 						case *MeleeBullet:
-							if v.CancellableStFrame <= currPlayerDownsync.FramesInChState && currPlayerDownsync.FramesInChState < v.CancellableEdFrame {
+							if v.Bullet.CancellableStFrame <= currPlayerDownsync.FramesInChState && currPlayerDownsync.FramesInChState < v.Bullet.CancellableEdFrame {
-								if nextSkillId, existent2 := v.CancelTransit[patternId]; existent2 {
+								if nextSkillId, existent2 := v.Bullet.CancelTransit[patternId]; existent2 {
 									return nextSkillId
 								}
 							}
@@ -121,8 +138,11 @@ var Characters = map[int]*CharacterConfig{
 		GetUpInvinsibleFrames: int32(8),
 		GetUpFramesToRecover:  int32(30),
 
-		Speed:           int32(float64(1.0) * WORLD_TO_VIRTUAL_GRID_RATIO),
+		Speed:           int32(float64(3.0) * WORLD_TO_VIRTUAL_GRID_RATIO),
-		JumpingInitVelY: int32(float64(9) * WORLD_TO_VIRTUAL_GRID_RATIO),
+		JumpingInitVelY: int32(float64(7.5) * WORLD_TO_VIRTUAL_GRID_RATIO),
+
+		DashingEnabled: false,
+		OnWallEnabled:  false,
 
 		SkillMapper: func(patternId int, currPlayerDownsync *PlayerDownsync) int {
 			if 1 == patternId {
@@ -130,21 +150,29 @@ var Characters = map[int]*CharacterConfig{
 					if currPlayerDownsync.InAir {
 						return 257
 					} else {
-						return 10
+						return 7
 					}
 				} else {
 					// Now that "0 < FramesToRecover", we're only able to fire any skill if it's a cancellation
 					if skillConfig, existent1 := skills[int(currPlayerDownsync.ActiveSkillId)]; existent1 {
 						switch v := skillConfig.Hits[currPlayerDownsync.ActiveSkillHit].(type) {
 						case *MeleeBullet:
-							if v.CancellableStFrame <= currPlayerDownsync.FramesInChState && currPlayerDownsync.FramesInChState < v.CancellableEdFrame {
+							if v.Bullet.CancellableStFrame <= currPlayerDownsync.FramesInChState && currPlayerDownsync.FramesInChState < v.Bullet.CancellableEdFrame {
-								if nextSkillId, existent2 := v.CancelTransit[patternId]; existent2 {
+								if nextSkillId, existent2 := v.Bullet.CancelTransit[patternId]; existent2 {
 									return nextSkillId
 								}
 							}
 						}
 					}
 				}
+			} else if 2 == patternId {
+				if !currPlayerDownsync.InAir {
+					return 11
+				}
+			} else if 3 == patternId {
+				if !currPlayerDownsync.InAir {
+					return 10
+				}
 			}
 
 			// By default no skill can be fired
@@ -162,7 +190,7 @@ var skills = map[int]*Skill{
 		BoundChState:          ATK_CHARACTER_STATE_ATK1,
 		Hits: []interface{}{
 			&MeleeBullet{
-				Bullet: Bullet{
+				Bullet: &BulletConfig{
 					StartupFrames:      int32(7),
 					ActiveFrames:       int32(22),
 					HitStunFrames:      int32(13),
@@ -182,7 +210,9 @@ var skills = map[int]*Skill{
 					CancelTransit: map[int]int{
 						1: 2,
 					},
-					// TODO: Use non-zero "selfLockVel"
+					BlowUp:          false,
+					ExplosionFrames: 9,
+					SpeciesId:       int32(1),
 				},
 			},
 		},
@@ -195,7 +225,7 @@ var skills = map[int]*Skill{
 		BoundChState:          ATK_CHARACTER_STATE_ATK2,
 		Hits: []interface{}{
 			&MeleeBullet{
-				Bullet: Bullet{
+				Bullet: &BulletConfig{
 					StartupFrames:      int32(18),
 					ActiveFrames:       int32(18),
 					HitStunFrames:      int32(18),
@@ -214,6 +244,9 @@ var skills = map[int]*Skill{
 					CancelTransit: map[int]int{
 						1: 3,
 					},
+					BlowUp:          false,
+					ExplosionFrames: 9,
+					SpeciesId:       int32(1),
 				},
 			},
 		},
@@ -226,8 +259,8 @@ var skills = map[int]*Skill{
 		BoundChState:          ATK_CHARACTER_STATE_ATK3,
 		Hits: []interface{}{
 			&MeleeBullet{
-				Bullet: Bullet{
+				Bullet: &BulletConfig{
-					StartupFrames:   int32(15),
+					StartupFrames:   int32(8),
 					ActiveFrames:    int32(30),
 					HitStunFrames:   MAX_INT32,
 					BlockStunFrames: int32(9),
@@ -236,11 +269,13 @@ var skills = map[int]*Skill{
 					SelfLockVelY:    int32(float64(5) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					PushbackVelX:    int32(float64(2) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					PushbackVelY:    int32(float64(7) * WORLD_TO_VIRTUAL_GRID_RATIO),
-					HitboxOffsetX:   int32(float64(32) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					HitboxOffsetX:   int32(float64(16) * WORLD_TO_VIRTUAL_GRID_RATIO),
-					HitboxOffsetY:   int32(0),
+					HitboxOffsetY:   int32(float64(8) * WORLD_TO_VIRTUAL_GRID_RATIO),
-					HitboxSizeX:     int32(float64(48) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					HitboxSizeX:     int32(float64(32) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					HitboxSizeY:     int32(float64(32) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					BlowUp:          true,
+					ExplosionFrames: 9,
+					SpeciesId:       int32(1),
 				},
 			},
 		},
@@ -253,7 +288,7 @@ var skills = map[int]*Skill{
 		BoundChState:          ATK_CHARACTER_STATE_ATK1,
 		Hits: []interface{}{
 			&MeleeBullet{
-				Bullet: Bullet{
+				Bullet: &BulletConfig{
 					StartupFrames:      int32(7),
 					ActiveFrames:       int32(22),
 					HitStunFrames:      int32(13),
@@ -267,13 +302,15 @@ var skills = map[int]*Skill{
 					HitboxOffsetY:      int32(0),
 					HitboxSizeX:        int32(float64(24) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					HitboxSizeY:        int32(float64(32) * WORLD_TO_VIRTUAL_GRID_RATIO),
-					CancellableStFrame: int32(13),
+					CancellableStFrame: int32(8),
 					CancellableEdFrame: int32(30),
 
 					CancelTransit: map[int]int{
 						1: 5,
 					},
-					// TODO: Use non-zero "selfLockVel"
+					BlowUp:          false,
+					ExplosionFrames: 15,
+					SpeciesId:       int32(2),
 				},
 			},
 		},
@@ -286,7 +323,7 @@ var skills = map[int]*Skill{
 		BoundChState:          ATK_CHARACTER_STATE_ATK2,
 		Hits: []interface{}{
 			&MeleeBullet{
-				Bullet: Bullet{
+				Bullet: &BulletConfig{
 					StartupFrames:      int32(18),
 					ActiveFrames:       int32(18),
 					HitStunFrames:      int32(18),
@@ -300,11 +337,14 @@ var skills = map[int]*Skill{
 					HitboxOffsetY:      int32(0),
 					HitboxSizeX:        int32(float64(24) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					HitboxSizeY:        int32(float64(32) * WORLD_TO_VIRTUAL_GRID_RATIO),
-					CancellableStFrame: int32(22),
+					CancellableStFrame: int32(19),
 					CancellableEdFrame: int32(36),
 					CancelTransit: map[int]int{
 						1: 6,
 					},
+					BlowUp:          false,
+					ExplosionFrames: 15,
+					SpeciesId:       int32(2),
 				},
 			},
 		},
@@ -317,21 +357,23 @@ var skills = map[int]*Skill{
 		BoundChState:          ATK_CHARACTER_STATE_ATK3,
 		Hits: []interface{}{
 			&MeleeBullet{
-				Bullet: Bullet{
+				Bullet: &BulletConfig{
-					StartupFrames:   int32(15),
+					StartupFrames:   int32(8),
 					ActiveFrames:    int32(28),
 					HitStunFrames:   MAX_INT32,
 					BlockStunFrames: int32(9),
 					Damage:          int32(10),
-					SelfLockVelX:    int32(float64(-0.1) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					SelfLockVelX:    NO_LOCK_VEL,
 					SelfLockVelY:    NO_LOCK_VEL,
 					PushbackVelX:    int32(float64(2) * WORLD_TO_VIRTUAL_GRID_RATIO),
-					PushbackVelY:    int32(float64(7) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					PushbackVelY:    int32(float64(3) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					HitboxOffsetX:   int32(float64(24) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					HitboxOffsetY:   int32(0),
 					HitboxSizeX:     int32(float64(32) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					HitboxSizeY:     int32(float64(32) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					BlowUp:          true,
+					ExplosionFrames: 15,
+					SpeciesId:       int32(2),
 				},
 			},
 		},
@@ -344,13 +386,13 @@ var skills = map[int]*Skill{
 		BoundChState:          ATK_CHARACTER_STATE_ATK1,
 		Hits: []interface{}{
 			&MeleeBullet{
-				Bullet: Bullet{
+				Bullet: &BulletConfig{
 					StartupFrames:      int32(7),
 					ActiveFrames:       int32(22),
 					HitStunFrames:      int32(13),
 					BlockStunFrames:    int32(9),
 					Damage:             int32(5),
-					SelfLockVelX:       int32(float64(0.05) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					SelfLockVelX:       NO_LOCK_VEL,
 					SelfLockVelY:       NO_LOCK_VEL,
 					PushbackVelX:       int32(float64(0.5) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					PushbackVelY:       int32(0),
@@ -362,9 +404,11 @@ var skills = map[int]*Skill{
 					CancellableEdFrame: int32(30),
 
 					CancelTransit: map[int]int{
-						1: 2,
+						1: 8,
 					},
-					// TODO: Use non-zero "selfLockVel"
+					BlowUp:          false,
+					ExplosionFrames: 9,
+					SpeciesId:       int32(1),
 				},
 			},
 		},
@@ -377,7 +421,7 @@ var skills = map[int]*Skill{
 		BoundChState:          ATK_CHARACTER_STATE_ATK2,
 		Hits: []interface{}{
 			&MeleeBullet{
-				Bullet: Bullet{
+				Bullet: &BulletConfig{
 					StartupFrames:      int32(18),
 					ActiveFrames:       int32(18),
 					HitStunFrames:      int32(18),
@@ -394,34 +438,40 @@ var skills = map[int]*Skill{
 					CancellableStFrame: int32(22),
 					CancellableEdFrame: int32(36),
 					CancelTransit: map[int]int{
-						1: 3,
+						1: 9,
 					},
+					BlowUp:          false,
+					ExplosionFrames: 9,
+					SpeciesId:       int32(1),
 				},
 			},
 		},
 	},
 	9: &Skill{
-		RecoveryFrames:        int32(50),
+		RecoveryFrames:        int32(40),
-		RecoveryFramesOnBlock: int32(50),
+		RecoveryFramesOnBlock: int32(40),
-		RecoveryFramesOnHit:   int32(50),
+		RecoveryFramesOnHit:   int32(40),
 		ReleaseTriggerType:    int32(1),
 		BoundChState:          ATK_CHARACTER_STATE_ATK3,
 		Hits: []interface{}{
 			&MeleeBullet{
-				Bullet: Bullet{
+				Bullet: &BulletConfig{
-					StartupFrames:   int32(15),
+					StartupFrames:   int32(7),
 					ActiveFrames:    int32(30),
 					HitStunFrames:   MAX_INT32,
 					BlockStunFrames: int32(9),
 					Damage:          int32(10),
-					SelfLockVelX:    int32(float64(0.5) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					SelfLockVelX:    int32(float64(1) * WORLD_TO_VIRTUAL_GRID_RATIO),
-					SelfLockVelY:    int32(float64(5) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					SelfLockVelY:    NO_LOCK_VEL,
 					PushbackVelX:    int32(float64(2) * WORLD_TO_VIRTUAL_GRID_RATIO),
-					PushbackVelY:    int32(float64(7) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					PushbackVelY:    int32(float64(4) * WORLD_TO_VIRTUAL_GRID_RATIO),
-					HitboxOffsetX:   int32(float64(32) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					HitboxOffsetX:   int32(float64(10) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					HitboxOffsetY:   int32(0),
-					HitboxSizeX:     int32(float64(48) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					HitboxSizeX:     int32(float64(32) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					HitboxSizeY:     int32(float64(32) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					BlowUp:          true,
+					ExplosionFrames: 9,
+					SpeciesId:       int32(1),
 				},
 			},
 		},
@@ -434,9 +484,9 @@ var skills = map[int]*Skill{
 		BoundChState:          ATK_CHARACTER_STATE_ATK4,
 		Hits: []interface{}{
 			&FireballBullet{
-				Speed: int32(float64(8) * WORLD_TO_VIRTUAL_GRID_RATIO),
+				Speed: int32(float64(5) * WORLD_TO_VIRTUAL_GRID_RATIO),
-				Bullet: Bullet{
+				Bullet: &BulletConfig{
-					StartupFrames:   int32(15),
+					StartupFrames:   int32(12),
 					ActiveFrames:    MAX_INT32,
 					HitStunFrames:   int32(15),
 					BlockStunFrames: int32(9),
@@ -445,10 +495,42 @@ var skills = map[int]*Skill{
 					SelfLockVelY:    NO_LOCK_VEL,
 					PushbackVelX:    int32(float64(2) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					PushbackVelY:    int32(0),
-					HitboxOffsetX:   int32(float64(32) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					HitboxOffsetX:   int32(float64(24) * WORLD_TO_VIRTUAL_GRID_RATIO),
-					HitboxOffsetY:   int32(0),
+					HitboxOffsetY:   int32(float64(5) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					HitboxSizeX:     int32(float64(48) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					HitboxSizeY:     int32(float64(32) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					BlowUp:          false,
+					ExplosionFrames: 15,
+					SpeciesId:       int32(1),
+				},
+			},
+		},
+	},
+	11: &Skill{
+		RecoveryFrames:        int32(60),
+		RecoveryFramesOnBlock: int32(60),
+		RecoveryFramesOnHit:   int32(60),
+		ReleaseTriggerType:    int32(1),
+		BoundChState:          ATK_CHARACTER_STATE_ATK5,
+		Hits: []interface{}{
+			&MeleeBullet{
+				Bullet: &BulletConfig{
+					StartupFrames:   int32(3),
+					ActiveFrames:    int32(25),
+					HitStunFrames:   MAX_INT32,
+					BlockStunFrames: int32(9),
+					Damage:          int32(30),
+					SelfLockVelX:    int32(float64(1) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					SelfLockVelY:    int32(float64(8) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					PushbackVelX:    int32(float64(2) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					PushbackVelY:    int32(float64(7) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					HitboxOffsetX:   int32(float64(8) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					HitboxOffsetY:   int32(0),
+					HitboxSizeX:     int32(float64(40) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					HitboxSizeY:     int32(float64(64) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					BlowUp:          true,
+					ExplosionFrames: 15,
+					SpeciesId:       int32(3),
 				},
 			},
 		},
@@ -461,7 +543,7 @@ var skills = map[int]*Skill{
 		BoundChState:          ATK_CHARACTER_STATE_INAIR_ATK1,
 		Hits: []interface{}{
 			&MeleeBullet{
-				Bullet: Bullet{
+				Bullet: &BulletConfig{
 					StartupFrames:   int32(3),
 					ActiveFrames:    int32(20),
 					HitStunFrames:   int32(18),
@@ -475,6 +557,9 @@ var skills = map[int]*Skill{
 					HitboxOffsetY:   int32(0),
 					HitboxSizeX:     int32(float64(32) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					HitboxSizeY:     int32(float64(24) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					BlowUp:          false,
+					ExplosionFrames: 9,
+					SpeciesId:       int32(1),
 				},
 			},
 		},
@@ -487,7 +572,7 @@ var skills = map[int]*Skill{
 		BoundChState:          ATK_CHARACTER_STATE_INAIR_ATK1,
 		Hits: []interface{}{
 			&MeleeBullet{
-				Bullet: Bullet{
+				Bullet: &BulletConfig{
 					StartupFrames:   int32(3),
 					ActiveFrames:    int32(10),
 					HitStunFrames:   int32(15),
@@ -501,6 +586,9 @@ var skills = map[int]*Skill{
 					HitboxOffsetY:   int32(0),
 					HitboxSizeX:     int32(float64(32) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					HitboxSizeY:     int32(float64(24) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					BlowUp:          false,
+					ExplosionFrames: 15,
+					SpeciesId:       int32(2),
 				},
 			},
 		},
@@ -513,7 +601,7 @@ var skills = map[int]*Skill{
 		BoundChState:          ATK_CHARACTER_STATE_INAIR_ATK1,
 		Hits: []interface{}{
 			&MeleeBullet{
-				Bullet: Bullet{
+				Bullet: &BulletConfig{
 					StartupFrames:   int32(3),
 					ActiveFrames:    int32(20),
 					HitStunFrames:   int32(18),
@@ -527,6 +615,9 @@ var skills = map[int]*Skill{
 					HitboxOffsetY:   int32(0),
 					HitboxSizeX:     int32(float64(32) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					HitboxSizeY:     int32(float64(24) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					BlowUp:          false,
+					ExplosionFrames: 9,
+					SpeciesId:       int32(1),
 				},
 			},
 		},

jsexport/battle/room_downsync_frame.go

@@ -33,6 +33,9 @@ type PlayerDownsync struct {
 	MaxHp             int32
 	CharacterState    int32
 	InAir             bool
+	OnWall            bool
+	OnWallNormX       int32
+	OnWallNormY       int32
 
 	ActiveSkillId  int32
 	ActiveSkillHit int32
@@ -59,16 +62,11 @@ type Barrier struct {
 	Boundary *Polygon2D
 }
 
-type Bullet struct {
+type BulletConfig struct {
-	BulletLocalId int32 // for referencing cached nodes in frontend rendering
+	StartupFrames      int32 // from "OriginatedRenderFrameId"
-
+	CancellableStFrame int32 // from "OriginatedRenderFrameId"
-	// for offender
+	CancellableEdFrame int32 // from "OriginatedRenderFrameId"
-	OriginatedRenderFrameId int32 // Copied from the first bullet for all subsequent bullets
+	ActiveFrames       int32
-	OffenderJoinIndex       int32 // Copied to favor collision handling of the dispatched bullet
-	StartupFrames           int32 // from "OriginatedRenderFrameId"
-	CancellableStFrame      int32 // from "OriginatedRenderFrameId"
-	CancellableEdFrame      int32 // from "OriginatedRenderFrameId"
-	ActiveFrames            int32
 
 	// for defender
 	HitStunFrames   int32
@@ -85,26 +83,41 @@ type Bullet struct {
 	HitboxSizeX   int32
 	HitboxSizeY   int32
 
-	BlowUp bool
+	BlowUp          bool
+	ExplosionFrames int32
+	SpeciesId       int32 // For fireball, this SpeciesId specifies both the active animation and the explosion animation, for melee it specifies the explosion animation
 
 	CancelTransit map[int]int
+}
 
-	TeamId int32
+type BulletBattleAttr struct {
+	BulletLocalId int32 // for referencing cached nodes in frontend rendering
+
+	// for offender
+	OriginatedRenderFrameId int32 // Copied from the first bullet for all subsequent bullets
+	OffenderJoinIndex       int32 // Copied to favor collision handling of the dispatched bullet
+	TeamId                  int32
 }
 
 type MeleeBullet struct {
-	Bullet
+	BlState         int32 // bullet state, e.g. STARTUP, ACTIVE, EXPLODING
+	FramesInBlState int32
+	BattleAttr      *BulletBattleAttr
+	Bullet          *BulletConfig
 }
 
 type FireballBullet struct {
-	VirtualGridX int32
+	VirtualGridX    int32
-	VirtualGridY int32
+	VirtualGridY    int32
-	DirX         int32
+	DirX            int32
-	DirY         int32
+	DirY            int32
-	VelX         int32
+	VelX            int32
-	VelY         int32
+	VelY            int32
-	Speed        int32
+	Speed           int32
-	Bullet
+	BlState         int32 // bullet state, e.g. STARTUP, ACTIVE, EXPLODING
+	FramesInBlState int32
+	BattleAttr      *BulletBattleAttr
+	Bullet          *BulletConfig
 }
 
 type Skill struct {
@@ -115,6 +128,7 @@ type Skill struct {
 	ReleaseTriggerType    int32 // 1: rising-edge, 2: falling-edge
 	BoundChState          int32
 	Hits                  []interface{} // Hits within a "Skill" are automatically triggered
+	// [WARN] Multihit of a fireball is more difficult to handle than that of melee, because we have to count from the fireball's first hit; the situation becomes even more complicated when a multihit fireball is in a crowd -- remains to be designed
 }
 
 type RoomDownsyncFrame struct {

jsexport/main.go

@@ -42,7 +42,7 @@ func NewBarrierJs(boundary *Polygon2D) *js.Object {
 	})
 }
 
-func NewPlayerDownsyncJs(id, virtualGridX, virtualGridY, dirX, dirY, velX, velY, framesToRecover, framesInChState, activeSkillId, activeSkillHit, framesInvinsible, speed, battleState, characterState, joinIndex, hp, maxHp, colliderRadius int32, inAir bool, bulletTeamId, chCollisionTeamId int32) *js.Object {
+func NewPlayerDownsyncJs(id, virtualGridX, virtualGridY, dirX, dirY, velX, velY, framesToRecover, framesInChState, activeSkillId, activeSkillHit, framesInvinsible, speed, battleState, characterState, joinIndex, hp, maxHp, colliderRadius int32, inAir, onWall bool, onWallNormX, onWallNormY, bulletTeamId, chCollisionTeamId int32) *js.Object {
 	return js.MakeWrapper(&PlayerDownsync{
 		Id:                id,
 		VirtualGridX:      virtualGridX,
@@ -64,82 +64,20 @@ func NewPlayerDownsyncJs(id, virtualGridX, virtualGridY, dirX, dirY, velX, velY,
 		MaxHp:             maxHp,
 		ColliderRadius:    colliderRadius,
 		InAir:             inAir,
+		OnWall:            onWall,
+		OnWallNormX:       onWallNormX,
+		OnWallNormY:       onWallNormY,
 		BulletTeamId:      bulletTeamId,
 		ChCollisionTeamId: chCollisionTeamId,
 	})
 }
 
-func NewMeleeBulletJs(bulletLocalId, originatedRenderFrameId, offenderJoinIndex, startupFrames, cancellableStFrame, cancellableEdFrame, activeFrames, hitStunFrames, blockStunFrames, pushbackVelX, pushbackVelY, damage, selfLockVelX, selfLockVelY, hitboxOffsetX, hitboxOffsetY, hitboxSizeX, hitboxSizeY int32, blowUp bool, teamId int32) *js.Object {
+func NewMeleeBulletJs(bulletLocalId, originatedRenderFrameId, offenderJoinIndex, startupFrames, cancellableStFrame, cancellableEdFrame, activeFrames, hitStunFrames, blockStunFrames, pushbackVelX, pushbackVelY, damage, selfLockVelX, selfLockVelY, hitboxOffsetX, hitboxOffsetY, hitboxSizeX, hitboxSizeY int32, blowUp bool, teamId, blState, framesInBlState, explosionFrames, speciesId int32) *js.Object {
-	return js.MakeWrapper(&MeleeBullet{
+	return js.MakeWrapper(NewMeleeBullet(bulletLocalId, originatedRenderFrameId, offenderJoinIndex, startupFrames, cancellableStFrame, cancellableEdFrame, activeFrames, hitStunFrames, blockStunFrames, pushbackVelX, pushbackVelY, damage, selfLockVelX, selfLockVelY, hitboxOffsetX, hitboxOffsetY, hitboxSizeX, hitboxSizeY, blowUp, teamId, blState, framesInBlState, explosionFrames, speciesId))
-		Bullet: Bullet{
-			BulletLocalId:           bulletLocalId,
-			OriginatedRenderFrameId: originatedRenderFrameId,
-			OffenderJoinIndex:       offenderJoinIndex,
-
-			StartupFrames:      startupFrames,
-			CancellableStFrame: cancellableStFrame,
-			CancellableEdFrame: cancellableEdFrame,
-			ActiveFrames:       activeFrames,
-
-			HitStunFrames:   hitStunFrames,
-			BlockStunFrames: blockStunFrames,
-			PushbackVelX:    pushbackVelX,
-			PushbackVelY:    pushbackVelY,
-			Damage:          damage,
-
-			SelfLockVelX: selfLockVelX,
-			SelfLockVelY: selfLockVelY,
-
-			HitboxOffsetX: hitboxOffsetX,
-			HitboxOffsetY: hitboxOffsetY,
-			HitboxSizeX:   hitboxSizeX,
-			HitboxSizeY:   hitboxSizeY,
-
-			BlowUp: blowUp,
-
-			TeamId: teamId,
-		},
-	})
 }
 
-func NewFireballBulletJs(bulletLocalId, originatedRenderFrameId, offenderJoinIndex, startupFrames, cancellableStFrame, cancellableEdFrame, activeFrames, hitStunFrames, blockStunFrames, pushbackVelX, pushbackVelY, damage, selfLockVelX, selfLockVelY, hitboxOffsetX, hitboxOffsetY, hitboxSizeX, hitboxSizeY int32, blowUp bool, teamId int32, virtualGridX, virtualGridY, dirX, dirY, velX, velY, speed int32) *js.Object {
+func NewFireballBulletJs(bulletLocalId, originatedRenderFrameId, offenderJoinIndex, startupFrames, cancellableStFrame, cancellableEdFrame, activeFrames, hitStunFrames, blockStunFrames, pushbackVelX, pushbackVelY, damage, selfLockVelX, selfLockVelY, hitboxOffsetX, hitboxOffsetY, hitboxSizeX, hitboxSizeY int32, blowUp bool, teamId int32, virtualGridX, virtualGridY, dirX, dirY, velX, velY, speed, blState, framesInBlState, explosionFrames, speciesId int32) *js.Object {
-	return js.MakeWrapper(&FireballBullet{
+	return js.MakeWrapper(NewFireballBullet(bulletLocalId, originatedRenderFrameId, offenderJoinIndex, startupFrames, cancellableStFrame, cancellableEdFrame, activeFrames, hitStunFrames, blockStunFrames, pushbackVelX, pushbackVelY, damage, selfLockVelX, selfLockVelY, hitboxOffsetX, hitboxOffsetY, hitboxSizeX, hitboxSizeY, blowUp, teamId, virtualGridX, virtualGridY, dirX, dirY, velX, velY, speed, blState, framesInBlState, explosionFrames, speciesId))
-		VirtualGridX: virtualGridX,
-		VirtualGridY: virtualGridY,
-		DirX:         dirX,
-		DirY:         dirY,
-		VelX:         velX,
-		VelY:         velY,
-		Speed:        speed,
-		Bullet: Bullet{
-			BulletLocalId:           bulletLocalId,
-			OriginatedRenderFrameId: originatedRenderFrameId,
-			OffenderJoinIndex:       offenderJoinIndex,
-
-			StartupFrames:      startupFrames,
-			CancellableStFrame: cancellableStFrame,
-			CancellableEdFrame: cancellableEdFrame,
-			ActiveFrames:       activeFrames,
-
-			HitStunFrames:   hitStunFrames,
-			BlockStunFrames: blockStunFrames,
-			PushbackVelX:    pushbackVelX,
-			PushbackVelY:    pushbackVelY,
-			Damage:          damage,
-
-			SelfLockVelX: selfLockVelX,
-			SelfLockVelY: selfLockVelY,
-
-			HitboxOffsetX: hitboxOffsetX,
-			HitboxOffsetY: hitboxOffsetY,
-			HitboxSizeX:   hitboxSizeX,
-			HitboxSizeY:   hitboxSizeY,
-
-			BlowUp: blowUp,
-
-			TeamId: teamId,
-		},
-	})
 }
 
 func NewNpcPatrolCue(flAct, frAct uint64, x, y float64) *js.Object {
@@ -233,5 +171,9 @@ func main() {
 		"ConvertToFirstUsedRenderFrameId":                      ConvertToFirstUsedRenderFrameId,
 		"ConvertToLastUsedRenderFrameId":                       ConvertToLastUsedRenderFrameId,
 		"ShouldGenerateInputFrameUpsync":                       ShouldGenerateInputFrameUpsync,
+		"IsMeleeBulletActive":                                  IsMeleeBulletActive,
+		"IsMeleeBulletAlive":                                   IsMeleeBulletAlive,
+		"IsFireballBulletActive":                               IsFireballBulletActive,
+		"IsFireballBulletAlive":                                IsFireballBulletAlive,
 	})
 }