Minor fix.

.gitignore

@@ -1,3 +1,5 @@
+.vs
+**/.vs
 battle_srv/test_cases/test_cases
 battle_srv/test_cases/tests
 *.pid

README.md

@@ -1,16 +1,16 @@
 # 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). 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 :)
+This project is a demo for a websocket-based rollback netcode inspired by [GGPO](https://github.com/pond3r/ggpo/blob/master/doc/README.md). 
 
-The following video is recorded over INTERNET using an input delay of 4 frames and it feels SMOOTH when playing! Please also checkout these demo videos
-- [source video of the first gif (earlier version)](https://pan.baidu.com/s/1ML6hNupaPHPJRd5rcTvQvw?pwd=8ruc) 
-- [source video of the second gif (added turn-around optimization & dashing)](https://pan.baidu.com/s/1isMcLvxax4NNkDgitV_FDg?pwd=s1i6) 
+[Demo recorded over INTERNET (Phone-Wifi v.s. PC-Wifi UDP holepunched) using an input delay of 6 frames](https://pan.baidu.com/s/1UArwqDShLoPjYppjjqsTqQ?pwd=10wc), and it feels SMOOTH when playing!
 
-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.
+![Merged_cut_annotated_spedup](./charts/Merged_cut_annotated_spedup.gif)
 
-![gif_demo_1](./charts/internet_fireball_explosion_wallmove_spedup.gif)
+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) -- **since v0.9.25, the project is actually equipped with UDP capabilities as follows**.
+- When using the so called `native apps` on `Android` and `Windows` (I'm working casually hard to support `iOS` next), the frontends will try to use UDP hole-punching w/ the help of backend as a registry. If UDP hole-punching is working, the rollback is often less than `turn-around frames to recover` and thus not noticeable, being much better than using websocket alone. This video shows how the UDP holepunched p2p performs for [Phone-Wifi v.s. PC-Wifi (viewed by PC side)](https://pan.baidu.com/s/1K6704bJKlrSBTVqGcXhajA?pwd=l7ok).
+- If UDP hole-punching is not working, e.g. for Symmetric NAT like in 4G/5G cellular network, the frontends will use backend as a UDP tunnel (or relay, whatever you like to call it). This video shows how the UDP tunnel performs for [Phone-4G v.s. PC-Wifi (viewed by PC side)](https://pan.baidu.com/s/1IZVa5wVgAdeH6D-xsZYFUw?pwd=dgkj). 
+- Browser vs `native app` is possible but in that case only websocket is used.
 
-![gif_demo_2](./charts/internet_dash_turnaround_cut_spedup.gif)
 
 # Notable Features
 - Backend dynamics toggle via [Room.BackendDynamicsEnabled](https://github.com/genxium/DelayNoMore/blob/v0.9.14/battle_srv/models/room.go#L786)
@@ -22,7 +22,7 @@ _(how input delay roughly works)_
 
 ![input_delay_intro](./charts/InputDelayIntro.jpg)
 
-_(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)_
+_(how rollback-and-chase in this project roughly works)_
 
 ![server_clients](./charts/ServerClients.jpg)
 ![rollback_and_chase_intro](./charts/RollbackAndChase.jpg)
@@ -108,4 +108,38 @@ Moreover, in practice I found that to spot sync anomalies, the following tools a
 - Detection of [type#2 forceConfirmation on the backend](https://github.com/genxium/DelayNoMore/blob/v0.9.19/battle_srv/models/room.go#L1259).
 
 There's also some useful information displayed on the frontend when `true == Map.showNetworkDoctorInfo`.
-![networkstats](./charts/networkstats.png)
+![networkstats](./charts/networkstats.png)
+
+### 2.3 WIN32 platform tool versioning
+![visual_studio](./charts/VisualStudioSetup.png)
+When building for native platforms, it's much more convenient to trigger the CocosCreator project forming frmo CLI, e.g.
+```
+shell> cd <proj-root>
+shell> /path/to/CocosCreator.exe --path ./frontend --build "platform=win32;debug=true"
+```
+
+### 2.4 CococCreator native build reloading
+CocosCreator doesn't have perfect file cache management during native project building, use "Developer Tools > Reload" to reset the IDE status upon mysterious errors.
+![ccc_reload](./charts/NativeBuildReload.png)
+
+Another issue is with the package name, see the screenshot below, kindly note that after successfully building with a blank package name, you can then re-fill the desired package name and build again! 
+![ccc_package_name](./charts/PackageNameIssueInCcc.png)
+
+### 2.5 Checking UDP port binding result
+__*nix__
+``` 
+netstat -anp | grep <your_port>
+``` 
+
+__Windows__
+``` 
+netstat -ano | grep <your_port>
+``` 
+
+### 2.6 Checking native code crash on non-rooted Android phone 
+```
+DeveloperOs> adb bugreport ./logs.zip
+# The file "logs.zip" will be automatically pulled to current folder of the DeveloperOS, copy "logs/FS/data/tomestones" out of the zip, then use the binary "$NDK_ROOT/ndk-stack" to analyze whichever tombstone you're interested in, for example, I often use the following
+DeveloperOs> ${NDK_ROOT}/ndk-stack.cmd -sym \path\to\DelayNoMore\frontend\build\jsb-link\frameworks\runtime-src\proj.android-studio\app\build\intermediates\ndkBuild\debug\obj\local\arm64-v8a -dump \path\to\tombstones\tombstone_03  
+# The param "-sym \path\to\objs" tells "ndk-stack" to decode "tombstone_03" with symbols provided by all the files inside that "\path\to\objs".
+```

battle_srv/common/conf.go

@@ -37,6 +37,8 @@ type mysqlConf struct {
 
 type sioConf struct {
 	HostAndPort string `json:"hostAndPort"`
+	UdpHost     string `json:"udpHost"`
+	UdpPort     int    `json:"udpPort"`
 }
 
 type botServerConf struct {

battle_srv/configs.template/sio.json

@@ -1,3 +1,5 @@
 {
-  "hostAndPort": "0.0.0.0:9992" 
+  "hostAndPort": "0.0.0.0:9992", 
+  "udpHost": "0.0.0.0", 
+  "udpPort": 3000 
 }

battle_srv/main.go

@@ -23,6 +23,8 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/robfig/cron"
 	"go.uber.org/zap"
+
+	"net"
 )
 
 func main() {
@@ -34,7 +36,7 @@ func main() {
 		env_tools.MergeTestPlayerAccounts()
 	}
 	models.InitRoomHeapManager()
-	startScheduler()
+	// startScheduler()
 	router := gin.Default()
 	setRouter(router)
 
@@ -54,6 +56,7 @@ func main() {
 		}
 		Logger.Info("Listening and serving HTTP on", zap.Any("Conf.Sio.HostAndPort", Conf.Sio.HostAndPort))
 	}()
+	go startGrandUdpServer()
 	var gracefulStop = make(chan os.Signal)
 	signal.Notify(gracefulStop, syscall.SIGTERM)
 	signal.Notify(gracefulStop, syscall.SIGINT)
@@ -114,3 +117,33 @@ func startScheduler() {
 	//c.AddFunc("*/1 * * * * *", FuncName)
 	c.Start()
 }
+
+func startGrandUdpServer() {
+	conn, err := net.ListenUDP("udp", &net.UDPAddr{
+		Port: Conf.Sio.UdpPort,
+		IP:   net.ParseIP(Conf.Sio.UdpHost),
+	})
+	if err != nil {
+		panic(err)
+	}
+
+	defer func() {
+		conn.Close()
+		if r := recover(); r != nil {
+			Logger.Error("`GrandUdpServer`, recovery spot#1, recovered from: ", zap.Any("panic", r))
+		}
+		Logger.Info(fmt.Sprintf("The `GrandUdpServer` is stopped"))
+	}()
+
+	Logger.Info(fmt.Sprintf("`GrandUdpServer` started at %s", conn.LocalAddr().String()))
+
+	for {
+		message := make([]byte, 2046)
+		rlen, remote, err := conn.ReadFromUDP(message[:])
+		if err != nil {
+			panic(err)
+		}
+		Logger.Info(fmt.Sprintf("`GrandUdpServer` received: %d bytes from %s\n", rlen, remote))
+		ws.HandleUdpHolePunchingForPlayer(message[0:rlen], remote)
+	}
+}

battle_srv/models/pb_type_convert.go

@@ -22,34 +22,36 @@ func toPbRoomDownsyncFrame(rdf *battle.RoomDownsyncFrame) *pb.RoomDownsyncFrame
 
 	for i, last := range rdf.PlayersArr {
 		pbPlayer := &pb.PlayerDownsync{
-			Id:                last.Id,
-			VirtualGridX:      last.VirtualGridX,
-			VirtualGridY:      last.VirtualGridY,
-			DirX:              last.DirX,
-			DirY:              last.DirY,
-			VelX:              last.VelX,
-			VelY:              last.VelY,
-			FramesToRecover:   last.FramesToRecover,
-			FramesInChState:   last.FramesInChState,
-			ActiveSkillId:     last.ActiveSkillId,
-			ActiveSkillHit:    last.ActiveSkillHit,
-			FramesInvinsible:  last.FramesInvinsible,
-			Speed:             last.Speed,
-			BattleState:       last.BattleState,
-			CharacterState:    last.CharacterState,
-			InAir:             last.InAir,
-			OnWall:            last.OnWall,
-			OnWallNormX:       last.OnWallNormX,
-			OnWallNormY:       last.OnWallNormY,
-			CapturedByInertia: last.CapturedByInertia,
-			JoinIndex:         last.JoinIndex,
-			BulletTeamId:      last.BulletTeamId,
-			ChCollisionTeamId: last.ChCollisionTeamId,
-			Hp:                last.Hp,
-			MaxHp:             last.MaxHp,
-			ColliderRadius:    last.ColliderRadius,
-			Score:             last.Score,
-			Removed:           last.Removed,
+			Id:                  last.Id,
+			VirtualGridX:        last.VirtualGridX,
+			VirtualGridY:        last.VirtualGridY,
+			DirX:                last.DirX,
+			DirY:                last.DirY,
+			VelX:                last.VelX,
+			VelY:                last.VelY,
+			FramesToRecover:     last.FramesToRecover,
+			FramesInChState:     last.FramesInChState,
+			ActiveSkillId:       last.ActiveSkillId,
+			ActiveSkillHit:      last.ActiveSkillHit,
+			FramesInvinsible:    last.FramesInvinsible,
+			Speed:               last.Speed,
+			BattleState:         last.BattleState,
+			CharacterState:      last.CharacterState,
+			InAir:               last.InAir,
+			OnWall:              last.OnWall,
+			OnWallNormX:         last.OnWallNormX,
+			OnWallNormY:         last.OnWallNormY,
+			CapturedByInertia:   last.CapturedByInertia,
+			JoinIndex:           last.JoinIndex,
+			BulletTeamId:        last.BulletTeamId,
+			ChCollisionTeamId:   last.ChCollisionTeamId,
+			Hp:                  last.Hp,
+			MaxHp:               last.MaxHp,
+			RevivalVirtualGridX: last.RevivalVirtualGridX,
+			RevivalVirtualGridY: last.RevivalVirtualGridY,
+			ColliderRadius:      last.ColliderRadius,
+			Score:               last.Score,
+			Removed:             last.Removed,
 		}
 		ret.PlayersArr[i] = pbPlayer
 	}
@@ -147,32 +149,36 @@ func toPbPlayers(modelInstances map[int32]*Player, withMetaInfo bool) []*pb.Play
 
 	for _, last := range modelInstances {
 		pbPlayer := &pb.PlayerDownsync{
-			Id:                last.Id,
-			VirtualGridX:      last.VirtualGridX,
-			VirtualGridY:      last.VirtualGridY,
-			DirX:              last.DirX,
-			DirY:              last.DirY,
-			VelX:              last.VelX,
-			VelY:              last.VelY,
-			FramesToRecover:   last.FramesToRecover,
-			FramesInChState:   last.FramesInChState,
-			ActiveSkillId:     last.ActiveSkillId,
-			ActiveSkillHit:    last.ActiveSkillHit,
-			FramesInvinsible:  last.FramesInvinsible,
-			Speed:             last.Speed,
-			BattleState:       last.BattleState,
-			CharacterState:    last.CharacterState,
-			InAir:             last.InAir,
-			OnWall:            last.OnWall,
-			OnWallNormX:       last.OnWallNormX,
-			OnWallNormY:       last.OnWallNormY,
-			CapturedByInertia: last.CapturedByInertia,
-			JoinIndex:         last.JoinIndex,
-			BulletTeamId:      last.BulletTeamId,
-			ChCollisionTeamId: last.ChCollisionTeamId,
-			ColliderRadius:    last.ColliderRadius,
-			Score:             last.Score,
-			Removed:           last.Removed,
+			Id:                  last.Id,
+			VirtualGridX:        last.VirtualGridX,
+			VirtualGridY:        last.VirtualGridY,
+			DirX:                last.DirX,
+			DirY:                last.DirY,
+			VelX:                last.VelX,
+			VelY:                last.VelY,
+			FramesToRecover:     last.FramesToRecover,
+			FramesInChState:     last.FramesInChState,
+			ActiveSkillId:       last.ActiveSkillId,
+			ActiveSkillHit:      last.ActiveSkillHit,
+			FramesInvinsible:    last.FramesInvinsible,
+			Speed:               last.Speed,
+			BattleState:         last.BattleState,
+			CharacterState:      last.CharacterState,
+			InAir:               last.InAir,
+			OnWall:              last.OnWall,
+			OnWallNormX:         last.OnWallNormX,
+			OnWallNormY:         last.OnWallNormY,
+			CapturedByInertia:   last.CapturedByInertia,
+			JoinIndex:           last.JoinIndex,
+			BulletTeamId:        last.BulletTeamId,
+			ChCollisionTeamId:   last.ChCollisionTeamId,
+			Hp:                  last.Hp,
+			MaxHp:               last.MaxHp,
+			RevivalVirtualGridX: last.RevivalVirtualGridX,
+			RevivalVirtualGridY: last.RevivalVirtualGridY,
+			ColliderRadius:      last.ColliderRadius,
+			Score:               last.Score,
+			Removed:             last.Removed,
 		}
 		if withMetaInfo {
 			pbPlayer.Name = last.Name
@@ -193,34 +199,36 @@ func toJsPlayers(modelInstances map[int32]*Player) []*battle.PlayerDownsync {
 
 	for _, last := range modelInstances {
 		toRet[last.JoinIndex-1] = &battle.PlayerDownsync{
-			Id:                last.Id,
-			VirtualGridX:      last.VirtualGridX,
-			VirtualGridY:      last.VirtualGridY,
-			DirX:              last.DirX,
-			DirY:              last.DirY,
-			VelX:              last.VelX,
-			VelY:              last.VelY,
-			FramesToRecover:   last.FramesToRecover,
-			FramesInChState:   last.FramesInChState,
-			ActiveSkillId:     last.ActiveSkillId,
-			ActiveSkillHit:    last.ActiveSkillHit,
-			FramesInvinsible:  last.FramesInvinsible,
-			Speed:             last.Speed,
-			BattleState:       last.BattleState,
-			CharacterState:    last.CharacterState,
-			JoinIndex:         last.JoinIndex,
-			BulletTeamId:      last.BulletTeamId,
-			ChCollisionTeamId: last.ChCollisionTeamId,
-			Hp:                last.Hp,
-			MaxHp:             last.MaxHp,
-			ColliderRadius:    last.ColliderRadius,
-			InAir:             last.InAir,
-			OnWall:            last.OnWall,
-			OnWallNormX:       last.OnWallNormX,
-			OnWallNormY:       last.OnWallNormY,
-			CapturedByInertia: last.CapturedByInertia,
-			Score:             last.Score,
-			Removed:           last.Removed,
+			Id:                  last.Id,
+			VirtualGridX:        last.VirtualGridX,
+			VirtualGridY:        last.VirtualGridY,
+			DirX:                last.DirX,
+			DirY:                last.DirY,
+			VelX:                last.VelX,
+			VelY:                last.VelY,
+			FramesToRecover:     last.FramesToRecover,
+			FramesInChState:     last.FramesInChState,
+			ActiveSkillId:       last.ActiveSkillId,
+			ActiveSkillHit:      last.ActiveSkillHit,
+			FramesInvinsible:    last.FramesInvinsible,
+			Speed:               last.Speed,
+			BattleState:         last.BattleState,
+			CharacterState:      last.CharacterState,
+			JoinIndex:           last.JoinIndex,
+			BulletTeamId:        last.BulletTeamId,
+			ChCollisionTeamId:   last.ChCollisionTeamId,
+			Hp:                  last.Hp,
+			MaxHp:               last.MaxHp,
+			RevivalVirtualGridX: last.RevivalVirtualGridX,
+			RevivalVirtualGridY: last.RevivalVirtualGridY,
+			ColliderRadius:      last.ColliderRadius,
+			InAir:               last.InAir,
+			OnWall:              last.OnWall,
+			OnWallNormX:         last.OnWallNormX,
+			OnWallNormY:         last.OnWallNormY,
+			CapturedByInertia:   last.CapturedByInertia,
+			Score:               last.Score,
+			Removed:             last.Removed,
 		}
 	}
 

battle_srv/models/player.go

@@ -8,6 +8,7 @@ import (
 	sq "github.com/Masterminds/squirrel"
 	"github.com/jmoiron/sqlx"
 	"go.uber.org/zap"
+	"net"
 )
 
 type PlayerBattleState struct {
@@ -46,10 +47,15 @@ type Player struct {
 	TutorialStage int       `db:"tutorial_stage"`
 
 	// other in-battle info fields
-	LastReceivedInputFrameId int32
-	LastSentInputFrameId     int32
-	AckingFrameId            int32
-	AckingInputFrameId       int32
+	LastReceivedInputFrameId    int32
+	LastUdpReceivedInputFrameId int32
+	LastSentInputFrameId        int32
+	AckingFrameId               int32
+	AckingInputFrameId          int32
+
+	UdpAddr                *PeerUdpAddr
+	BattleUdpTunnelAddr    *net.UDPAddr // This addr is used by backend only, not visible to frontend
+	BattleUdpTunnelAuthKey int32
 }
 
 func ExistPlayerByName(name string) (bool, error) {

battle_srv/models/room.go

@@ -13,6 +13,7 @@ import (
 	"io/ioutil"
 	"jsexport/battle"
 	"math/rand"
+	"net"
 	"os"
 	"path/filepath"
 	"resolv"
@@ -32,6 +33,7 @@ const (
 	DOWNSYNC_MSG_ACT_BATTLE_STOPPED   = int32(3)
 	DOWNSYNC_MSG_ACT_FORCED_RESYNC    = int32(4)
 	DOWNSYNC_MSG_ACT_PEER_INPUT_BATCH = int32(5)
+	DOWNSYNC_MSG_ACT_PEER_UDP_ADDR    = int32(6)
 
 	DOWNSYNC_MSG_ACT_BATTLE_READY_TO_START = int32(-1)
 	DOWNSYNC_MSG_ACT_BATTLE_START          = int32(0)
@@ -134,7 +136,7 @@ type Room struct {
 	EffectivePlayerCount                   int32
 	DismissalWaitGroup                     sync.WaitGroup
 	InputsBuffer                           *battle.RingBuffer // Indices are STRICTLY consecutive
-	InputsBufferLock                       sync.Mutex         // Guards [InputsBuffer, LatestPlayerUpsyncedInputFrameId, LastAllConfirmedInputFrameId, LastAllConfirmedInputList, LastAllConfirmedInputFrameIdWithChange, LastIndividuallyConfirmedInputList, player.LastReceivedInputFrameId]
+	InputsBufferLock                       sync.Mutex         // Guards [InputsBuffer, LatestPlayerUpsyncedInputFrameId, LastAllConfirmedInputFrameId, LastAllConfirmedInputList, LastAllConfirmedInputFrameIdWithChange, LastIndividuallyConfirmedInputList, player.LastReceivedInputFrameId, player.LastUdpReceivedInputFrameId]
 	RenderFrameBuffer                      *battle.RingBuffer // Indices are STRICTLY consecutive
 	LatestPlayerUpsyncedInputFrameId       int32
 	LastAllConfirmedInputFrameId           int32
@@ -156,6 +158,10 @@ type Room struct {
 
 	rdfIdToActuallyUsedInput           map[int32]*pb.InputFrameDownsync
 	LastIndividuallyConfirmedInputList []uint64
+
+	BattleUdpTunnelLock sync.Mutex
+	BattleUdpTunnelAddr *pb.PeerUdpAddr
+	BattleUdpTunnel     *net.UDPConn
 }
 
 func (pR *Room) updateScore() {
@@ -176,10 +182,14 @@ func (pR *Room) AddPlayerIfPossible(pPlayerFromDbInit *Player, session *websocke
 
 	defer pR.onPlayerAdded(playerId)
 
+	pPlayerFromDbInit.UdpAddr = nil
+	pPlayerFromDbInit.BattleUdpTunnelAddr = nil
+	pPlayerFromDbInit.BattleUdpTunnelAuthKey = rand.Int31()
 	pPlayerFromDbInit.AckingFrameId = -1
 	pPlayerFromDbInit.AckingInputFrameId = -1
 	pPlayerFromDbInit.LastSentInputFrameId = MAGIC_LAST_SENT_INPUT_FRAME_ID_NORMAL_ADDED
 	pPlayerFromDbInit.LastReceivedInputFrameId = MAGIC_LAST_SENT_INPUT_FRAME_ID_NORMAL_ADDED
+	pPlayerFromDbInit.LastUdpReceivedInputFrameId = MAGIC_LAST_SENT_INPUT_FRAME_ID_NORMAL_ADDED
 	pPlayerFromDbInit.BattleState = PlayerBattleStateIns.ADDED_PENDING_BATTLE_COLLIDER_ACK
 
 	pPlayerFromDbInit.ColliderRadius = DEFAULT_PLAYER_RADIUS // Hardcoded
@@ -215,9 +225,13 @@ func (pR *Room) ReAddPlayerIfPossible(pTmpPlayerInstance *Player, session *webso
 	 */
 	defer pR.onPlayerReAdded(playerId)
 	pEffectiveInRoomPlayerInstance := pR.Players[playerId]
+	pEffectiveInRoomPlayerInstance.UdpAddr = nil
+	pEffectiveInRoomPlayerInstance.BattleUdpTunnelAddr = nil
+	pEffectiveInRoomPlayerInstance.BattleUdpTunnelAuthKey = rand.Int31()
 	pEffectiveInRoomPlayerInstance.AckingFrameId = -1
 	pEffectiveInRoomPlayerInstance.AckingInputFrameId = -1
 	pEffectiveInRoomPlayerInstance.LastSentInputFrameId = MAGIC_LAST_SENT_INPUT_FRAME_ID_READDED
+	// [WARNING] DON'T reset "player.LastReceivedInputFrameId" & "player.LastUdpReceivedInputFrameId" upon reconnection!
 	pEffectiveInRoomPlayerInstance.BattleState = PlayerBattleStateIns.READDED_PENDING_BATTLE_COLLIDER_ACK
 
 	pEffectiveInRoomPlayerInstance.ColliderRadius = DEFAULT_PLAYER_RADIUS // Hardcoded
@@ -315,8 +329,8 @@ func (pR *Room) InputsBufferString(allDetails bool) string {
 		// Appending of the array of strings can be very SLOW due to on-demand heap allocation! Use this printing with caution.
 		s := make([]string, 0)
 		s = append(s, fmt.Sprintf("{renderFrameId: %v, stInputFrameId: %v, edInputFrameId: %v, lastAllConfirmedInputFrameIdWithChange: %v, lastAllConfirmedInputFrameId: %v}", pR.RenderFrameId, pR.InputsBuffer.StFrameId, pR.InputsBuffer.EdFrameId, pR.LastAllConfirmedInputFrameIdWithChange, pR.LastAllConfirmedInputFrameId))
-		for playerId, player := range pR.PlayersArr {
-			s = append(s, fmt.Sprintf("{playerId: %v, ackingFrameId: %v, ackingInputFrameId: %v, lastSentInputFrameId: %v}", playerId, player.AckingFrameId, player.AckingInputFrameId, player.LastSentInputFrameId))
+		for _, player := range pR.PlayersArr {
+			s = append(s, fmt.Sprintf("{playerId: %v, ackingFrameId: %v, ackingInputFrameId: %v, lastSentInputFrameId: %v}", player.Id, player.AckingFrameId, player.AckingInputFrameId, player.LastSentInputFrameId))
 		}
 		for i := pR.InputsBuffer.StFrameId; i < pR.InputsBuffer.EdFrameId; i++ {
 			tmp := pR.InputsBuffer.GetByFrameId(i)
@@ -562,7 +576,7 @@ func (pR *Room) StartBattle() {
 	})
 }
 
-func (pR *Room) OnBattleCmdReceived(pReq *pb.WsReq) {
+func (pR *Room) OnBattleCmdReceived(pReq *pb.WsReq, fromUDP bool) {
 	/*
 	   [WARNING] This function "OnBattleCmdReceived" could be called by different ws sessions and thus from different threads!
 
@@ -607,20 +621,21 @@ func (pR *Room) OnBattleCmdReceived(pReq *pb.WsReq) {
 		//Logger.Debug(fmt.Sprintf("OnBattleCmdReceived-InputsBufferLock unlocked: roomId=%v, fromPlayerId=%v", pR.Id, playerId))
 	}()
 
-	inputsBufferSnapshot := pR.markConfirmationIfApplicable(inputFrameUpsyncBatch, playerId, player)
+	inputsBufferSnapshot := pR.markConfirmationIfApplicable(inputFrameUpsyncBatch, playerId, player, fromUDP)
 	if nil != inputsBufferSnapshot {
 		pR.downsyncToAllPlayers(inputsBufferSnapshot)
-	} else {
-		// no new all-confirmed
-		toSendInputFrameDownsyncs := pR.cloneInputsBuffer(inputFrameUpsyncBatch[0].InputFrameId, inputFrameUpsyncBatch[len(inputFrameUpsyncBatch)-1].InputFrameId+1)
+	} /*else {
+	        // FIXME: Enable this block after we can proactively detect whether there's any "secondary ws session player" in the battle to avoid waste of resource in creating the snapshot
+			// no new all-confirmed
+			toSendInputFrameDownsyncs := pR.cloneInputsBuffer(inputFrameUpsyncBatch[0].InputFrameId, inputFrameUpsyncBatch[len(inputFrameUpsyncBatch)-1].InputFrameId+1)
 
-		inputsBufferSnapshot = &pb.InputsBufferSnapshot{
-			ToSendInputFrameDownsyncs: toSendInputFrameDownsyncs,
-			PeerJoinIndex:             player.JoinIndex,
-		}
-		//Logger.Info(fmt.Sprintf("OnBattleCmdReceived no new all-confirmed: roomId=%v, fromPlayerId=%v, forming peer broadcasting snapshot=%v", pR.Id, playerId, inputsBufferSnapshot))
-		pR.broadcastPeerUpsyncForBetterPrediction(inputsBufferSnapshot)
-	}
+			inputsBufferSnapshot = &pb.InputsBufferSnapshot{
+				ToSendInputFrameDownsyncs: toSendInputFrameDownsyncs,
+				PeerJoinIndex:             player.JoinIndex,
+			}
+			//Logger.Info(fmt.Sprintf("OnBattleCmdReceived no new all-confirmed: roomId=%v, fromPlayerId=%v, forming peer broadcasting snapshot=%v", pR.Id, playerId, inputsBufferSnapshot))
+			pR.broadcastPeerUpsyncForBetterPrediction(inputsBufferSnapshot)
+		}*/
 }
 
 func (pR *Room) onInputFrameDownsyncAllConfirmed(inputFrameDownsync *battle.InputFrameDownsync, playerId int32) {
@@ -662,6 +677,10 @@ func (pR *Room) StopBattleForSettlement() {
 	if RoomBattleStateIns.IN_BATTLE != pR.State {
 		return
 	}
+	pR.BattleUdpTunnelLock.Lock()
+	pR.BattleUdpTunnel.Close()
+	pR.BattleUdpTunnelLock.Unlock()
+
 	pR.State = RoomBattleStateIns.STOPPING_BATTLE_FOR_SETTLEMENT
 	Logger.Info("Stopping the `battleMainLoop` for:", zap.Any("roomId", pR.Id))
 	pR.RenderFrameId++
@@ -798,7 +817,7 @@ func (pR *Room) OnDismissed() {
 
 	pR.RenderFrameId = 0
 	pR.CurDynamicsRenderFrameId = 0
-	pR.NstDelayFrames = 16
+	pR.NstDelayFrames = 24
 
 	serverFps := 60
 	pR.RollbackEstimatedDtMillis = 16.667  // Use fixed-and-low-precision to mitigate the inconsistent floating-point-number issue between Golang and JavaScript
@@ -806,20 +825,26 @@ func (pR *Room) OnDismissed() {
 	dilutedServerFps := float64(58.0)      // Don't set this value too small, otherwise we might miss force confirmation needs for slow tickers!
 	pR.dilutedRollbackEstimatedDtNanos = int64(float64(pR.RollbackEstimatedDtNanos) * float64(serverFps) / dilutedServerFps)
 	pR.BattleDurationFrames = int32(60 * serverFps)
+	//pR.BattleDurationFrames = int32(20 * serverFps)
 	pR.BattleDurationNanos = int64(pR.BattleDurationFrames) * (pR.RollbackEstimatedDtNanos + 1)
 	pR.InputFrameUpsyncDelayTolerance = battle.ConvertToNoDelayInputFrameId(pR.NstDelayFrames) - 1 // this value should be strictly smaller than (NstDelayFrames >> InputScaleFrames), otherwise "type#1 forceConfirmation" might become a lag avalanche
-	pR.MaxChasingRenderFramesPerUpdate = 4                                                         // Don't set this value too high to avoid exhausting frontend CPU within a single frame
+	pR.MaxChasingRenderFramesPerUpdate = 9                                                         // Don't set this value too high to avoid exhausting frontend CPU within a single frame, roughly as the "turn-around frames to recover" is empirically OK
 
 	pR.BackendDynamicsEnabled = true              // [WARNING] When "false", recovery upon reconnection wouldn't work!
 	pR.ForceAllResyncOnAnyActiveSlowTicker = true // See tradeoff discussion in "downsyncToAllPlayers"
 
 	pR.FrameDataLoggingEnabled = false // [WARNING] DON'T ENABLE ON LONG BATTLE DURATION! It consumes A LOT OF MEMORY!
+	pR.BattleUdpTunnelLock.Lock()
+	pR.BattleUdpTunnel = nil
+	pR.BattleUdpTunnelAddr = nil
+	pR.BattleUdpTunnelLock.Unlock()
 
 	pR.ChooseStage()
 	pR.EffectivePlayerCount = 0
 
 	// [WARNING] It's deliberately ordered such that "pR.State = RoomBattleStateIns.IDLE" is put AFTER all the refreshing operations above.
 	pR.State = RoomBattleStateIns.IDLE
+	go pR.startBattleUdpTunnel() // Would reassign "pR.BattleUdpTunnel"
 	pR.updateScore()
 
 	Logger.Info("The room is completely dismissed(all playerDownsyncChan closed):", zap.Any("roomId", pR.Id))
@@ -955,7 +980,10 @@ func (pR *Room) onPlayerAdded(playerId int32) {
 			if nil == playerPos {
 				panic(fmt.Sprintf("onPlayerAdded error, nil == playerPos, roomId=%v, playerId=%v, roomState=%v, roomEffectivePlayerCount=%v", pR.Id, playerId, pR.State, pR.EffectivePlayerCount))
 			}
-			pR.Players[playerId].VirtualGridX, pR.Players[playerId].VirtualGridY = battle.WorldToVirtualGridPos(playerPos.X, playerPos.Y)
+			pR.Players[playerId].RevivalVirtualGridX, pR.Players[playerId].RevivalVirtualGridY = battle.WorldToVirtualGridPos(playerPos.X, playerPos.Y)
+			pR.Players[playerId].VirtualGridX, pR.Players[playerId].VirtualGridY = pR.Players[playerId].RevivalVirtualGridX, pR.Players[playerId].RevivalVirtualGridY
+			pR.Players[playerId].MaxHp = 100 // Hardcoded for now
+			pR.Players[playerId].Hp = pR.Players[playerId].MaxHp
 			// Hardcoded initial character orientation/facing
 			if 0 == (pR.Players[playerId].JoinIndex % 2) {
 				pR.Players[playerId].DirX = -2
@@ -1068,7 +1096,9 @@ func (pR *Room) sendSafely(roomDownsyncFrame *pb.RoomDownsyncFrame, toSendInputF
 		panic(fmt.Sprintf("Error marshaling downsync message: roomId=%v, playerId=%v, roomState=%v, roomEffectivePlayerCount=%v", pR.Id, playerId, pR.State, pR.EffectivePlayerCount))
 	}
 
-	if MAGIC_JOIN_INDEX_DEFAULT == peerJoinIndex {
+	shouldUseSecondaryWsSession := (MAGIC_JOIN_INDEX_DEFAULT != peerJoinIndex && DOWNSYNC_MSG_ACT_INPUT_BATCH == act) // FIXME: Simplify the condition
+	//Logger.Info(fmt.Sprintf("shouldUseSecondaryWsSession=%v: roomId=%v, playerId=%v, roomState=%v, roomEffectivePlayerCount=%v", shouldUseSecondaryWsSession, pR.Id, playerId, pR.State, pR.EffectivePlayerCount))
+	if !shouldUseSecondaryWsSession {
 		if playerDownsyncSession, existent := pR.PlayerDownsyncSessionDict[playerId]; existent {
 			if err := playerDownsyncSession.WriteMessage(websocket.BinaryMessage, theBytes); nil != err {
 				panic(fmt.Sprintf("Error sending primary downsync message: roomId=%v, playerId=%v, roomState=%v, roomEffectivePlayerCount=%v, err=%v", pR.Id, playerId, pR.State, pR.EffectivePlayerCount, err))
@@ -1135,7 +1165,7 @@ func (pR *Room) getOrPrefabInputFrameDownsync(inputFrameId int32) *battle.InputF
 	return currInputFrameDownsync
 }
 
-func (pR *Room) markConfirmationIfApplicable(inputFrameUpsyncBatch []*pb.InputFrameUpsync, playerId int32, player *Player) *pb.InputsBufferSnapshot {
+func (pR *Room) markConfirmationIfApplicable(inputFrameUpsyncBatch []*pb.InputFrameUpsync, playerId int32, player *Player, fromUDP bool) *pb.InputsBufferSnapshot {
 	// [WARNING] This function MUST BE called while "pR.InputsBufferLock" is locked!
 	// Step#1, put the received "inputFrameUpsyncBatch" into "pR.InputsBuffer"
 	for _, inputFrameUpsync := range inputFrameUpsyncBatch {
@@ -1146,6 +1176,7 @@ func (pR *Room) markConfirmationIfApplicable(inputFrameUpsyncBatch []*pb.InputFr
 			continue
 		}
 		if clientInputFrameId < player.LastReceivedInputFrameId {
+			// [WARNING] It's important for correctness that we use "player.LastReceivedInputFrameId" instead of "player.LastUdpReceivedInputFrameId" here!
 			Logger.Debug(fmt.Sprintf("Omitting obsolete inputFrameUpsync#2: roomId=%v, playerId=%v, clientInputFrameId=%v, playerLastReceivedInputFrameId=%v, InputsBuffer=%v", pR.Id, playerId, clientInputFrameId, player.LastReceivedInputFrameId, pR.InputsBufferString(false)))
 			continue
 		}
@@ -1158,11 +1189,25 @@ func (pR *Room) markConfirmationIfApplicable(inputFrameUpsyncBatch []*pb.InputFr
 		targetInputFrameDownsync.InputList[player.JoinIndex-1] = inputFrameUpsync.Encoded
 		targetInputFrameDownsync.ConfirmedList |= uint64(1 << uint32(player.JoinIndex-1))
 
-		player.LastReceivedInputFrameId = clientInputFrameId
-		pR.LastIndividuallyConfirmedInputList[player.JoinIndex-1] = inputFrameUpsync.Encoded
+		if false == fromUDP {
+			/*
+							   [WARNING] We have to distinguish whether or not the incoming batch is from UDP here, otherwise "pR.LatestPlayerUpsyncedInputFrameId - pR.LastAllConfirmedInputFrameId" might become unexpectedly large in case of "UDP packet loss + slow ws session"!
 
-		if clientInputFrameId > pR.LatestPlayerUpsyncedInputFrameId {
-			pR.LatestPlayerUpsyncedInputFrameId = clientInputFrameId
+							   Moreover, only ws session upsyncs should advance "player.LastReceivedInputFrameId" & "pR.LatestPlayerUpsyncedInputFrameId".
+
+				               Kindly note that the updates of "player.LastReceivedInputFrameId" could be discrete before and after reconnection.
+			*/
+			player.LastReceivedInputFrameId = clientInputFrameId
+			if clientInputFrameId > pR.LatestPlayerUpsyncedInputFrameId {
+				pR.LatestPlayerUpsyncedInputFrameId = clientInputFrameId
+			}
+		}
+
+		if clientInputFrameId > player.LastUdpReceivedInputFrameId {
+			// No need to update "player.LastUdpReceivedInputFrameId" only when "true == fromUDP", we should keep "player.LastUdpReceivedInputFrameId >= player.LastReceivedInputFrameId" at any moment.
+			player.LastUdpReceivedInputFrameId = clientInputFrameId
+			// It's safe (in terms of getting an eventually correct "RenderFrameBuffer") to put the following update of "pR.LastIndividuallyConfirmedInputList" which is ONLY used for prediction in "InputsBuffer" out of "false == fromUDP" block.
+			pR.LastIndividuallyConfirmedInputList[player.JoinIndex-1] = inputFrameUpsync.Encoded
 		}
 	}
 
@@ -1229,6 +1274,7 @@ func (pR *Room) forceConfirmationIfApplicable(prevRenderFrameId int32) uint64 {
 	totPlayerCnt := uint32(pR.Capacity)
 	allConfirmedMask := uint64((1 << totPlayerCnt) - 1)
 	unconfirmedMask := uint64(0)
+	// As "pR.LastAllConfirmedInputFrameId" can be advanced by UDP but "pR.LatestPlayerUpsyncedInputFrameId" could only be advanced by ws session, when the following condition is met we know that the slow ticker is really in trouble!
 	if pR.LatestPlayerUpsyncedInputFrameId > (pR.LastAllConfirmedInputFrameId + pR.InputFrameUpsyncDelayTolerance + 1) {
 		// Type#1 check whether there's a significantly slow ticker among players
 		oldLastAllConfirmedInputFrameId := pR.LastAllConfirmedInputFrameId
@@ -1350,13 +1396,13 @@ func (pR *Room) printBarrier(barrierCollider *resolv.Object) {
 }
 
 func (pR *Room) doBattleMainLoopPerTickBackendDynamicsWithProperLocking(prevRenderFrameId int32, pDynamicsDuration *int64) {
-	Logger.Debug(fmt.Sprintf("doBattleMainLoopPerTickBackendDynamicsWithProperLocking-InputsBufferLock to about lock: roomId=%v", pR.Id))
+	//Logger.Debug(fmt.Sprintf("doBattleMainLoopPerTickBackendDynamicsWithProperLocking-InputsBufferLock to about lock: roomId=%v", pR.Id))
 	pR.InputsBufferLock.Lock()
-	Logger.Debug(fmt.Sprintf("doBattleMainLoopPerTickBackendDynamicsWithProperLocking-InputsBufferLock locked: roomId=%v", pR.Id))
+	//Logger.Debug(fmt.Sprintf("doBattleMainLoopPerTickBackendDynamicsWithProperLocking-InputsBufferLock locked: roomId=%v", pR.Id))
 
 	defer func() {
 		pR.InputsBufferLock.Unlock()
-		Logger.Debug(fmt.Sprintf("doBattleMainLoopPerTickBackendDynamicsWithProperLocking-InputsBufferLock unlocked: roomId=%v", pR.Id))
+		//Logger.Debug(fmt.Sprintf("doBattleMainLoopPerTickBackendDynamicsWithProperLocking-InputsBufferLock unlocked: roomId=%v", pR.Id))
 	}()
 
 	if ok, thatRenderFrameId := battle.ShouldPrefabInputFrameDownsync(prevRenderFrameId, pR.RenderFrameId); ok {
@@ -1607,3 +1653,144 @@ func (pR *Room) SetSecondarySession(playerId int32, session *websocket.Conn, sig
 		}
 	}
 }
+
+func (pR *Room) UpdatePeerUdpAddrList(playerId int32, peerAddr *net.UDPAddr, pReq *pb.HolePunchUpsync) {
+	// TODO: There's a chance that by now "player.JoinIndex" is not yet determined, use a lock to sync
+	if player, ok := pR.Players[playerId]; ok && MAGIC_JOIN_INDEX_DEFAULT != player.JoinIndex {
+		playerBattleState := atomic.LoadInt32(&(player.BattleState))
+		switch playerBattleState {
+		case PlayerBattleStateIns.DISCONNECTED, PlayerBattleStateIns.LOST, PlayerBattleStateIns.EXPELLED_DURING_GAME, PlayerBattleStateIns.EXPELLED_IN_DISMISSAL:
+			// Kindly note that "PlayerBattleStateIns.ADDED_PENDING_BATTLE_COLLIDER_ACK, PlayerBattleStateIns.READDED_PENDING_BATTLE_COLLIDER_ACK" are allowed
+			return
+		}
+		if _, existent := pR.PlayerDownsyncSessionDict[playerId]; existent {
+			player.UdpAddr = &pb.PeerUdpAddr{
+				Ip:      peerAddr.IP.String(),
+				Port:    int32(peerAddr.Port),
+				AuthKey: pReq.AuthKey,
+			}
+			Logger.Info(fmt.Sprintf("UpdatePeerUdpAddrList done for roomId=%v, playerId=%d, peerAddr=%s", pR.Id, playerId, peerAddr))
+
+			peerJoinIndex := player.JoinIndex
+			peerUdpAddrList := make([]*pb.PeerUdpAddr, pR.Capacity, pR.Capacity)
+
+			for _, otherPlayer := range pR.Players {
+				if MAGIC_JOIN_INDEX_DEFAULT == otherPlayer.JoinIndex {
+					// TODO: Again this shouldn't happen, apply proper locking
+					continue
+				}
+				// In case of highly concurrent update that might occur while later marshalling, use the ptr of a copy
+				peerUdpAddrList[otherPlayer.JoinIndex-1] = &pb.PeerUdpAddr{
+					Ip:      otherPlayer.UdpAddr.Ip,
+					Port:    otherPlayer.UdpAddr.Port,
+					AuthKey: otherPlayer.UdpAddr.AuthKey,
+				}
+			}
+
+			// Broadcast this new UDP addr to all the existing players
+			for otherPlayerId, otherPlayer := range pR.Players {
+				otherPlayerBattleState := atomic.LoadInt32(&(otherPlayer.BattleState))
+				switch otherPlayerBattleState {
+				case PlayerBattleStateIns.DISCONNECTED, PlayerBattleStateIns.LOST, PlayerBattleStateIns.EXPELLED_DURING_GAME, PlayerBattleStateIns.EXPELLED_IN_DISMISSAL:
+					continue
+				}
+
+				Logger.Info(fmt.Sprintf("Downsyncing peerUdpAddrList for roomId=%v, playerId=%d", pR.Id, otherPlayerId))
+				pR.sendSafely(&pb.RoomDownsyncFrame{
+					PeerUdpAddrList: peerUdpAddrList,
+				}, nil, DOWNSYNC_MSG_ACT_PEER_UDP_ADDR, otherPlayerId, false, peerJoinIndex)
+			}
+		}
+	}
+}
+
+func (pR *Room) startBattleUdpTunnel() {
+	defer func() {
+		if r := recover(); r != nil {
+			Logger.Error("`BattleUdpTunnel` recovery spot#1, recovered from: ", zap.Any("roomId", pR.Id), zap.Any("panic", r))
+		}
+		Logger.Info(fmt.Sprintf("`BattleUdpTunnel` stopped for (roomId=%d)@renderFrameId=%v", pR.Id, pR.RenderFrameId))
+	}()
+
+	pR.BattleUdpTunnelLock.Lock()
+	conn, err := net.ListenUDP("udp", &net.UDPAddr{
+		Port: 0,
+		IP:   net.ParseIP(Conf.Sio.UdpHost),
+	})
+	if nil != err {
+		// No need to close the "conn" upon error here
+		pR.BattleUdpTunnelLock.Unlock()
+		panic(err)
+	}
+	pR.BattleUdpTunnel = conn
+	switch v := conn.LocalAddr().(type) {
+	case (*net.UDPAddr):
+		pR.BattleUdpTunnelAddr = &pb.PeerUdpAddr{
+			Ip:      Conf.Sio.UdpHost,
+			Port:    int32(v.Port),
+			AuthKey: 0, // To be determined for each specific player upon joining and sent to it by BattleColliderInfo
+		}
+	}
+
+	pR.BattleUdpTunnelLock.Unlock()
+
+	defer func() {
+		if r := recover(); r != nil {
+			Logger.Warn("`BattleUdpTunnel` recovery spot#2, recovered from: ", zap.Any("roomId", pR.Id), zap.Any("panic", r))
+		}
+		Logger.Info(fmt.Sprintf("`BattleUdpTunnel` closed for (roomId=%d)@renderFrameId=%v", pR.Id, pR.RenderFrameId))
+	}()
+	Logger.Info(fmt.Sprintf("`BattleUdpTunnel` started for roomId=%d at %s", pR.Id, conn.LocalAddr().String()))
+	for {
+		message := make([]byte, 128)
+		rlen, remote, err := conn.ReadFromUDP(message[:]) // Would be unblocked when "conn.Close()" is called from another thread/goroutine, reference https://pkg.go.dev/net@go1.18.6#PacketConn
+		if nil != err {
+			// Should proceed to close the "conn" upon error here, if "conn" is already closed it'd just throw another error to be catched by "spot#2"
+			conn.Close()
+			panic(err)
+		}
+		pReq := new(pb.WsReq)
+		bytes := message[0:rlen]
+		if unmarshalErr := proto.Unmarshal(bytes, pReq); nil != unmarshalErr {
+			Logger.Warn(fmt.Sprintf("`BattleUdpTunnel` for roomId=%d failed to unmarshal %d bytes", pR.Id, rlen), zap.Error(unmarshalErr))
+			continue
+		}
+		playerId := pReq.PlayerId
+		//Logger.Info(fmt.Sprintf("`BattleUdpTunnel` for roomId=%d received decoded WsReq:", pR.Id), zap.Any("pReq", pReq))
+		if player, exists1 := pR.Players[playerId]; exists1 {
+			authKey := pReq.AuthKey
+			if authKey != player.BattleUdpTunnelAuthKey {
+				Logger.Warn(fmt.Sprintf("`BattleUdpTunnel` for roomId=%d received %d bytes for playerId=%d from %s, but (incomingAuthKey:%d != playerBattleUdpTunnelAuthKey:%d)\n", pR.Id, rlen, playerId, remote, authKey, player.BattleUdpTunnelAuthKey))
+				continue
+			}
+			if _, existent := pR.PlayerDownsyncSessionDict[playerId]; existent {
+				player.BattleUdpTunnelAddr = remote
+				//Logger.Info(fmt.Sprintf("`BattleUdpTunnel` for roomId=%d updated battleUdpAddr for playerId=%d to be %s\n", pR.Id, playerId, remote))
+
+				nowBattleState := atomic.LoadInt32(&pR.State)
+				if RoomBattleStateIns.IN_BATTLE == nowBattleState {
+					batch := pReq.InputFrameUpsyncBatch
+					if nil != batch && 0 < len(batch) {
+						peerJoinIndex := pReq.JoinIndex
+						// Broadcast to every other player in the same room/battle
+						for _, otherPlayer := range pR.PlayersArr {
+							if otherPlayer.JoinIndex == peerJoinIndex {
+								continue
+							}
+							_, wrerr := conn.WriteTo(bytes, otherPlayer.BattleUdpTunnelAddr)
+							if nil != wrerr {
+								Logger.Warn(fmt.Sprintf("`BattleUdpTunnel` for roomId=%d failed to forward upsync from (playerId:%d, joinIndex:%d, addr:%s) to (otherPlayerId:%d, otherPlayerJoinIndex:%d, otherPlayerAddr:%s)\n", pR.Id, playerId, peerJoinIndex, remote, otherPlayer.Id, otherPlayer.JoinIndex, otherPlayer.BattleUdpTunnelAddr))
+							}
+						}
+						pR.OnBattleCmdReceived(pReq, true) // To help advance "pR.LastAllConfirmedInputFrameId" asap, and even if "pR.LastAllConfirmedInputFrameId" is not advanced due to packet loss, these UDP packets would help prefill the "InputsBuffer" with correct player "future inputs (compared to ws session)" such that when "forceConfirmation" occurs we have as many correct predictions as possible
+					}
+
+				}
+			} else {
+				Logger.Warn(fmt.Sprintf("`BattleUdpTunnel` for roomId=%d received validated %d bytes for playerId=%d from %s, but primary downsync session for it doesn't exist\n", pR.Id, rlen, playerId, remote))
+			}
+		} else {
+			Logger.Warn(fmt.Sprintf("`BattleUdpTunnel` for roomId=%d received invalid %d bytes for playerId=%d from %s, but it doesn't belong to this room!\n", pR.Id, rlen, playerId, remote))
+		}
+	}
+}

battle_srv/ws/serve.go

@@ -10,6 +10,7 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/gorilla/websocket"
 	"go.uber.org/zap"
+	"net"
 	"net/http"
 	"strconv"
 	"sync/atomic"
@@ -256,17 +257,25 @@ func Serve(c *gin.Context) {
 			SpaceOffsetX: pRoom.SpaceOffsetX,
 			SpaceOffsetY: pRoom.SpaceOffsetY,
 
-			RenderCacheSize:  pRoom.RenderCacheSize,
-			CollisionMinStep: pRoom.CollisionMinStep,
+			RenderCacheSize:   pRoom.RenderCacheSize,
+			CollisionMinStep:  pRoom.CollisionMinStep,
+			BoundRoomCapacity: int32(pRoom.Capacity),
+
+			BattleUdpTunnel: &pb.PeerUdpAddr{
+				Ip:      pRoom.BattleUdpTunnelAddr.Ip,
+				Port:    pRoom.BattleUdpTunnelAddr.Port,
+				AuthKey: pThePlayer.BattleUdpTunnelAuthKey,
+			},
 
 			FrameDataLoggingEnabled: pRoom.FrameDataLoggingEnabled,
 		}
 
 		resp := &pb.WsResp{
-			Ret:         int32(Constants.RetCode.Ok),
-			EchoedMsgId: int32(0),
-			Act:         models.DOWNSYNC_MSG_ACT_HB_REQ,
-			BciFrame:    bciFrame,
+			Ret:           int32(Constants.RetCode.Ok),
+			EchoedMsgId:   int32(0),
+			Act:           models.DOWNSYNC_MSG_ACT_HB_REQ,
+			BciFrame:      bciFrame,
+			PeerJoinIndex: pThePlayer.JoinIndex,
 		}
 
 		Logger.Debug("Sending downsync HeartbeatRequirements:", zap.Any("roomId", pRoom.Id), zap.Any("playerId", playerId), zap.Any("resp", resp))
@@ -379,7 +388,7 @@ func Serve(c *gin.Context) {
 				startOrFeedHeartbeatWatchdog(conn)
 			case models.UPSYNC_MSG_ACT_PLAYER_CMD:
 				startOrFeedHeartbeatWatchdog(conn)
-				pRoom.OnBattleCmdReceived(pReq)
+				pRoom.OnBattleCmdReceived(pReq, false)
 			case models.UPSYNC_MSG_ACT_PLAYER_COLLIDER_ACK:
 				res := pRoom.OnPlayerBattleColliderAcked(int32(playerId))
 				if false == res {
@@ -432,12 +441,12 @@ func HandleSecondaryWsSessionForPlayer(c *gin.Context) {
 	playerId, err := models.GetPlayerIdByToken(token)
 	if err != nil || playerId == 0 {
 		// TODO: Abort with specific message.
-		Logger.Warn("Secondary ws session playerLogin record not found for ws authentication:", zap.Any("intAuthToken", token))
+		Logger.Warn("Secondary ws session playerLogin record not found:", zap.Any("intAuthToken", token))
 		c.AbortWithStatus(http.StatusBadRequest)
 		return
 	}
 
-	Logger.Info("Secondary ws session playerLogin record has been found for ws authentication:", zap.Any("playerId", playerId), zap.Any("intAuthToken", token), zap.Any("boundRoomId", boundRoomId))
+	Logger.Info("Secondary ws session playerLogin record has been found:", zap.Any("playerId", playerId), zap.Any("intAuthToken", token), zap.Any("boundRoomId", boundRoomId))
 
 	conn, err := upgrader.Upgrade(c.Writer, c.Request, nil)
 	if err != nil {
@@ -482,3 +491,32 @@ func HandleSecondaryWsSessionForPlayer(c *gin.Context) {
 
 	pRoom.SetSecondarySession(int32(playerId), conn, signalToCloseConnOfThisPlayer)
 }
+
+func HandleUdpHolePunchingForPlayer(message []byte, peerAddr *net.UDPAddr) {
+	pReq := new(pb.HolePunchUpsync)
+	if unmarshalErr := proto.Unmarshal(message, pReq); nil != unmarshalErr {
+		Logger.Error("`GrandUdpServer` failed to unmarshal", zap.Error(unmarshalErr))
+		return
+	}
+
+	token := pReq.IntAuthToken
+	boundRoomId := pReq.BoundRoomId
+
+	pRoom, existent := (*models.RoomMapManagerIns)[int32(boundRoomId)]
+	// Deliberately querying playerId after querying room, because the former is against persistent storage and could be slow!
+	if !existent {
+		Logger.Warn("`GrandUdpServer` failed to get:\n", zap.Any("intAuthToken", token), zap.Any("forBoundRoomId", boundRoomId))
+		return
+	}
+
+	// TODO: Wrap the following 2 stmts by sql transaction!
+	playerId, err := models.GetPlayerIdByToken(token)
+	if err != nil || playerId == 0 {
+		// TODO: Abort with specific message.
+		Logger.Warn("`GrandUdpServer` playerLogin record not found for:", zap.Any("intAuthToken", token))
+		return
+	}
+
+	Logger.Info("`GrandUdpServer` playerLogin record has been found:", zap.Any("playerId", playerId), zap.Any("intAuthToken", token), zap.Any("boundRoomId", boundRoomId), zap.Any("peerAddr", peerAddr))
+	pRoom.UpdatePeerUdpAddrList(int32(playerId), peerAddr, pReq)
+}

frontend/assets/plugin_scripts/auxiliaries.js

@@ -198,3 +198,6 @@ window.getOrCreateAnimationClipForGid = function(gid, tiledMapInfo, tilesElListU
     animationClip: animClip,
   };
 };
+
+// Node.js, this is a workaround to avoid accessing the non-existent "TextDecoder class" from "jsexport.js".
+window.fs = function() {};

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

@@ -3,7 +3,7 @@
   "_name": "Fireball1Explosion",
   "_objFlags": 0,
   "_native": "",
-  "_duration": 0.26666666666666666,
+  "_duration": 0.5,
   "sample": 60,
   "speed": 1,
   "wrapMode": 1,
@@ -30,19 +30,19 @@
             }
           },
           {
-            "frame": 0.15,
+            "frame": 0.16666666666666666,
             "value": {
               "__uuid__": "8b566f26-b34d-4da6-bdaa-078358a5b685"
             }
           },
           {
-            "frame": 0.2,
+            "frame": 0.31666666666666665,
             "value": {
               "__uuid__": "6ec5f75d-307e-4292-b667-cbbb5a52c2f6"
             }
           },
           {
-            "frame": 0.25,
+            "frame": 0.48333333333333334,
             "value": {
               "__uuid__": "d89977f1-d927-4a08-9591-9feb1daf68c8"
             }

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

@@ -0,0 +1,85 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "Fireball2Explosion",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.5,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "a1979f05-3ecc-4d70-9ea9-7822e35602c3"
+            }
+          },
+          {
+            "frame": 0.05,
+            "value": {
+              "__uuid__": "850884ca-2e6a-4d04-94d9-fd929ac33942"
+            }
+          },
+          {
+            "frame": 0.08333333333333333,
+            "value": {
+              "__uuid__": "88b9c254-1fd8-451f-902e-4a43a7ef5d51"
+            }
+          },
+          {
+            "frame": 0.13333333333333333,
+            "value": {
+              "__uuid__": "566342a3-cfde-44c9-afbe-7d9469653ccb"
+            }
+          },
+          {
+            "frame": 0.18333333333333332,
+            "value": {
+              "__uuid__": "d1620a98-de62-4069-8910-122f361d22a4"
+            }
+          },
+          {
+            "frame": 0.23333333333333334,
+            "value": {
+              "__uuid__": "2e9ed070-e592-4e77-8fa1-c5250deb006b"
+            }
+          },
+          {
+            "frame": 0.2833333333333333,
+            "value": {
+              "__uuid__": "a3e8357d-39da-42e8-b26b-f5ae7a68aed7"
+            }
+          },
+          {
+            "frame": 0.3333333333333333,
+            "value": {
+              "__uuid__": "3f3cb45c-732d-4bea-89b4-5495fb0d2c37"
+            }
+          },
+          {
+            "frame": 0.38333333333333336,
+            "value": {
+              "__uuid__": "d7aeb01a-4e04-4037-a2c4-ba72f45f69f3"
+            }
+          },
+          {
+            "frame": 0.43333333333333335,
+            "value": {
+              "__uuid__": "fe4a97a0-1207-4b81-a541-c2da0bf0a6f3"
+            }
+          },
+          {
+            "frame": 0.48333333333333334,
+            "value": {
+              "__uuid__": "97014ab9-8bdd-4b71-9f61-0639327f9159"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

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

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "14b92f5c-af81-416a-a162-e5822d20fe68",
+  "subMetas": {}
+}

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

@@ -0,0 +1,79 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "Fireball3Explosion",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.5,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "0e003318-f8c2-40f7-b144-140b5ca1e46a"
+            }
+          },
+          {
+            "frame": 0.06666666666666667,
+            "value": {
+              "__uuid__": "9c2b0cc2-9a52-4052-b796-cd6c6bd940d4"
+            }
+          },
+          {
+            "frame": 0.11666666666666667,
+            "value": {
+              "__uuid__": "76fe0c09-d2d6-432d-bacb-20d297eb4966"
+            }
+          },
+          {
+            "frame": 0.2,
+            "value": {
+              "__uuid__": "0735a7ff-0e50-472a-b0f9-8e2cc97be7e7"
+            }
+          },
+          {
+            "frame": 0.2833333333333333,
+            "value": {
+              "__uuid__": "993199a8-54a9-40d1-8d2f-12bf16af934c"
+            }
+          },
+          {
+            "frame": 0.35,
+            "value": {
+              "__uuid__": "5d8d9ffc-b4d6-4518-9946-953929ec055c"
+            }
+          },
+          {
+            "frame": 0.38333333333333336,
+            "value": {
+              "__uuid__": "6501ae08-b0ff-43ad-b5c5-cb6dc67f989d"
+            }
+          },
+          {
+            "frame": 0.4166666666666667,
+            "value": {
+              "__uuid__": "616cfa00-1dba-4a71-8141-36774933b6a9"
+            }
+          },
+          {
+            "frame": 0.45,
+            "value": {
+              "__uuid__": "4b296e86-2e96-4276-b6de-6a6b22530344"
+            }
+          },
+          {
+            "frame": 0.48333333333333334,
+            "value": {
+              "__uuid__": "f9cc8e37-c9c2-4f20-9d7e-4533c4e859fe"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

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

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "0dbb90ed-a08a-448c-b06e-4831260e9213",
+  "subMetas": {}
+}

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

@@ -0,0 +1,97 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "Fireball2",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.21666666666666667,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 2,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "db4c7e6f-9bee-4e7a-8628-d41b8bcaff42"
+            }
+          },
+          {
+            "frame": 0.016666666666666666,
+            "value": {
+              "__uuid__": "42796576-72b3-49c2-8c5a-ea946fbe1525"
+            }
+          },
+          {
+            "frame": 0.03333333333333333,
+            "value": {
+              "__uuid__": "0aa5a52f-a92a-4a4a-b49b-aee2b5a3eb55"
+            }
+          },
+          {
+            "frame": 0.05,
+            "value": {
+              "__uuid__": "0a7b5e41-acdc-4af3-beff-0a42aca9f91a"
+            }
+          },
+          {
+            "frame": 0.06666666666666667,
+            "value": {
+              "__uuid__": "de0b22b7-65ca-455f-bcd1-2ddd6cc114e2"
+            }
+          },
+          {
+            "frame": 0.08333333333333333,
+            "value": {
+              "__uuid__": "e9ce1383-9e3d-4d44-9f80-ab5fa2224138"
+            }
+          },
+          {
+            "frame": 0.1,
+            "value": {
+              "__uuid__": "5b22df7e-414b-44a3-989f-640c5b9417b9"
+            }
+          },
+          {
+            "frame": 0.11666666666666667,
+            "value": {
+              "__uuid__": "f459615c-70a4-421b-b649-a28460332364"
+            }
+          },
+          {
+            "frame": 0.13333333333333333,
+            "value": {
+              "__uuid__": "c2723b9d-fbd8-4524-a0dd-b110451e4e32"
+            }
+          },
+          {
+            "frame": 0.15,
+            "value": {
+              "__uuid__": "4286b3d1-fea2-41fd-8829-7635f546def4"
+            }
+          },
+          {
+            "frame": 0.16666666666666666,
+            "value": {
+              "__uuid__": "4e0d6419-62df-4382-893e-dd7cc47f7770"
+            }
+          },
+          {
+            "frame": 0.18333333333333332,
+            "value": {
+              "__uuid__": "f0cd9259-b323-4fba-ad8b-02d5e56c2cd4"
+            }
+          },
+          {
+            "frame": 0.2,
+            "value": {
+              "__uuid__": "0193b66d-06bb-49f9-b2f5-51fff8b16015"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

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

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "d2c65ac4-a5b3-411e-8d2d-18d3980649d7",
+  "subMetas": {}
+}

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

@@ -0,0 +1,73 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "Fireball3",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.5666666666666667,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 2,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "6af65d40-470c-47de-8b3d-f53c3923bf90"
+            }
+          },
+          {
+            "frame": 0.05,
+            "value": {
+              "__uuid__": "ebf64819-79a5-4366-bf70-08f3b1c6114c"
+            }
+          },
+          {
+            "frame": 0.13333333333333333,
+            "value": {
+              "__uuid__": "e03d879b-5227-4c11-a4b9-0a426967d28a"
+            }
+          },
+          {
+            "frame": 0.2,
+            "value": {
+              "__uuid__": "a1aa0c83-4a34-43ae-9a8f-56189808df68"
+            }
+          },
+          {
+            "frame": 0.26666666666666666,
+            "value": {
+              "__uuid__": "3cc28dd0-2518-4162-a39d-4e4b19f9d60b"
+            }
+          },
+          {
+            "frame": 0.35,
+            "value": {
+              "__uuid__": "1b41f500-c55b-4cbf-a040-287b6cc0e958"
+            }
+          },
+          {
+            "frame": 0.43333333333333335,
+            "value": {
+              "__uuid__": "cfa24c51-0ad4-4e3b-b571-c5500002d6e9"
+            }
+          },
+          {
+            "frame": 0.5,
+            "value": {
+              "__uuid__": "d4a46a6a-401c-4694-a192-0a7b3ce6f603"
+            }
+          },
+          {
+            "frame": 0.55,
+            "value": {
+              "__uuid__": "c88c5293-9f21-4a1a-a6b6-649e403dc7a2"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

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

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "6aef5812-d16c-4da1-96a3-a38ac227c823",
+  "subMetas": {}
+}

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

@@ -0,0 +1,73 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "Atk4",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 1.0166666666666666,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "da597a30-22da-4053-b4ee-1cfa27980a75"
+            }
+          },
+          {
+            "frame": 0.08333333333333333,
+            "value": {
+              "__uuid__": "b3604b4c-426f-4843-bb76-f09a9687950d"
+            }
+          },
+          {
+            "frame": 0.16666666666666666,
+            "value": {
+              "__uuid__": "24b51487-6c91-42d9-bd12-afbbf70f2e4b"
+            }
+          },
+          {
+            "frame": 0.2833333333333333,
+            "value": {
+              "__uuid__": "c318ad71-7a5e-43b0-8098-b7a34a6e6fbe"
+            }
+          },
+          {
+            "frame": 0.38333333333333336,
+            "value": {
+              "__uuid__": "85d6d8d7-81cf-4369-a501-6ad72d70f5a2"
+            }
+          },
+          {
+            "frame": 0.5,
+            "value": {
+              "__uuid__": "42b76eaf-db36-4835-9072-893337c83425"
+            }
+          },
+          {
+            "frame": 0.6,
+            "value": {
+              "__uuid__": "152f23a1-f70f-4db6-bb28-68625aef930f"
+            }
+          },
+          {
+            "frame": 0.8833333333333333,
+            "value": {
+              "__uuid__": "9c907eb5-84ab-4fa9-9404-9085f29706cc"
+            }
+          },
+          {
+            "frame": 1,
+            "value": {
+              "__uuid__": "74f0ffc8-cc25-4fcf-a6d8-bf093daba9ca"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

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

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "2aef91f9-ef47-4bb4-bf43-5441723aa639",
+  "subMetas": {}
+}

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

@@ -0,0 +1,103 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "Dying",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.5333333333333333,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "700f93f9-ef84-4cb2-b759-f39ceac1c1d1"
+            }
+          },
+          {
+            "frame": 0.016666666666666666,
+            "value": {
+              "__uuid__": "5b4ea047-594e-4d0b-8e08-e24117bf1e67"
+            }
+          },
+          {
+            "frame": 0.05,
+            "value": {
+              "__uuid__": "a822576c-d2eb-4c17-8969-03dd1da5a93e"
+            }
+          },
+          {
+            "frame": 0.1,
+            "value": {
+              "__uuid__": "85e92afc-4359-4a8d-bdfa-958a6134cd6a"
+            }
+          },
+          {
+            "frame": 0.15,
+            "value": {
+              "__uuid__": "88d6e560-1b65-4d78-949c-cbc0e67d33cc"
+            }
+          },
+          {
+            "frame": 0.2,
+            "value": {
+              "__uuid__": "9ac16319-c1af-41d1-910b-99cbfd6230b2"
+            }
+          },
+          {
+            "frame": 0.23333333333333334,
+            "value": {
+              "__uuid__": "2a6b168a-458f-4d19-a985-9b00cc6e37e8"
+            }
+          },
+          {
+            "frame": 0.26666666666666666,
+            "value": {
+              "__uuid__": "f8482295-dc0d-4265-be56-0b0a9f6f6b9b"
+            }
+          },
+          {
+            "frame": 0.31666666666666665,
+            "value": {
+              "__uuid__": "0d4a314c-119a-46b9-8dce-dbaacf2523e5"
+            }
+          },
+          {
+            "frame": 0.36666666666666664,
+            "value": {
+              "__uuid__": "18d4ff6c-6b57-461b-8588-03521fafc9d1"
+            }
+          },
+          {
+            "frame": 0.4,
+            "value": {
+              "__uuid__": "f25280f2-442a-4ad7-914e-0f96cbf108f5"
+            }
+          },
+          {
+            "frame": 0.45,
+            "value": {
+              "__uuid__": "ccccb669-d44d-4a5c-89a1-9aba9476ce12"
+            }
+          },
+          {
+            "frame": 0.48333333333333334,
+            "value": {
+              "__uuid__": "4a45c23d-7bc8-4c5e-b761-ac1100b12a09"
+            }
+          },
+          {
+            "frame": 0.5166666666666667,
+            "value": {
+              "__uuid__": "1c4359c5-b303-403d-82ad-8d5e6ae6ec99"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

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

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "ac90c9b8-3b06-4866-89ce-2c953a9d5a9a",
+  "subMetas": {}
+}

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

@@ -0,0 +1,61 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "Dashing",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.18333333333333332,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "ec69a078-4153-49e1-9450-656942c2a567"
+            }
+          },
+          {
+            "frame": 0.016666666666666666,
+            "value": {
+              "__uuid__": "bbf23710-9dc6-4bbb-9565-df8848819d07"
+            }
+          },
+          {
+            "frame": 0.03333333333333333,
+            "value": {
+              "__uuid__": "cc7b4103-1d6b-44c1-8e0c-ee1c49052837"
+            }
+          },
+          {
+            "frame": 0.05,
+            "value": {
+              "__uuid__": "90409bfe-7b6c-4eab-953b-ea630585fad4"
+            }
+          },
+          {
+            "frame": 0.06666666666666667,
+            "value": {
+              "__uuid__": "9614dc2a-9bfe-4b85-9aa6-d7d62feec82b"
+            }
+          },
+          {
+            "frame": 0.15,
+            "value": {
+              "__uuid__": "c326e3c0-140f-457b-a086-fe95c025d576"
+            }
+          },
+          {
+            "frame": 0.16666666666666666,
+            "value": {
+              "__uuid__": "8e2d7c5b-452d-44db-b0b4-8ee03b36e7f2"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

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

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "337d57ad-118c-40e2-be90-2aa1505c152b",
+  "subMetas": {}
+}

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

@@ -0,0 +1,115 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "Dying",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.5333333333333333,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "6d1cd049-7a44-4dcb-9018-4f0fbbf3fdf8"
+            }
+          },
+          {
+            "frame": 0.03333333333333333,
+            "value": {
+              "__uuid__": "50245b04-bcb1-4488-951c-49944c1037da"
+            }
+          },
+          {
+            "frame": 0.06666666666666667,
+            "value": {
+              "__uuid__": "7a6721bb-2321-4947-832f-9a317565ea88"
+            }
+          },
+          {
+            "frame": 0.11666666666666667,
+            "value": {
+              "__uuid__": "c3553a29-e04a-42e2-8b46-82aa85706e26"
+            }
+          },
+          {
+            "frame": 0.15,
+            "value": {
+              "__uuid__": "e221838e-740f-45b1-8fd5-80d4ab8563c3"
+            }
+          },
+          {
+            "frame": 0.2,
+            "value": {
+              "__uuid__": "37ebbd1d-9a18-4514-8331-1358a59cab83"
+            }
+          },
+          {
+            "frame": 0.23333333333333334,
+            "value": {
+              "__uuid__": "b4a9ee91-4315-4fb9-9900-6d763406c81d"
+            }
+          },
+          {
+            "frame": 0.26666666666666666,
+            "value": {
+              "__uuid__": "e5388e53-5268-4f54-9a93-f6506db5b77b"
+            }
+          },
+          {
+            "frame": 0.3,
+            "value": {
+              "__uuid__": "078814c3-90e2-4b17-a90b-d2046df9a351"
+            }
+          },
+          {
+            "frame": 0.3333333333333333,
+            "value": {
+              "__uuid__": "c605bf48-9cc5-41f1-8ace-a273298f7b21"
+            }
+          },
+          {
+            "frame": 0.38333333333333336,
+            "value": {
+              "__uuid__": "5b5083ca-8fca-4827-9b76-eaa08685b031"
+            }
+          },
+          {
+            "frame": 0.4166666666666667,
+            "value": {
+              "__uuid__": "b454af6f-9e07-4b34-952b-eca69dc13d5e"
+            }
+          },
+          {
+            "frame": 0.45,
+            "value": {
+              "__uuid__": "af921d09-a72e-4b48-8585-ba72377ba410"
+            }
+          },
+          {
+            "frame": 0.48333333333333334,
+            "value": {
+              "__uuid__": "733d339e-ed74-49ab-8955-641d21528fcc"
+            }
+          },
+          {
+            "frame": 0.5,
+            "value": {
+              "__uuid__": "b7335bea-2985-4331-92c2-08c4c2a5ec86"
+            }
+          },
+          {
+            "frame": 0.5166666666666667,
+            "value": {
+              "__uuid__": "0ae606ea-93c0-4815-9e24-62c5fb59decc"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

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

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "657d4193-2224-44ea-94f7-0305a9f2b322",
+  "subMetas": {}
+}

frontend/assets/resources/animation/MonkGirl/Atk4.anim

@@ -0,0 +1,91 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "Atk4",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.5333333333333333,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "a9a10466-1e80-4fb8-9c32-2019ee2c988d"
+            }
+          },
+          {
+            "frame": 0.05,
+            "value": {
+              "__uuid__": "e0e3907f-520c-4c4c-991a-ec554e24f368"
+            }
+          },
+          {
+            "frame": 0.1,
+            "value": {
+              "__uuid__": "e4bec6fe-db19-4cf6-a8cc-bfcc3e892d5e"
+            }
+          },
+          {
+            "frame": 0.15,
+            "value": {
+              "__uuid__": "c36ceda7-2e5d-42f4-ae7b-02064348a1c2"
+            }
+          },
+          {
+            "frame": 0.18333333333333332,
+            "value": {
+              "__uuid__": "07004da9-abd4-4a05-baee-447235dcdf2d"
+            }
+          },
+          {
+            "frame": 0.23333333333333334,
+            "value": {
+              "__uuid__": "dd047451-9715-4e68-9ae5-4e4556007190"
+            }
+          },
+          {
+            "frame": 0.2833333333333333,
+            "value": {
+              "__uuid__": "7b2acb5e-3ee8-4c26-b950-f201346cefde"
+            }
+          },
+          {
+            "frame": 0.31666666666666665,
+            "value": {
+              "__uuid__": "b378b873-fae7-49dd-8581-15136046e2f1"
+            }
+          },
+          {
+            "frame": 0.36666666666666664,
+            "value": {
+              "__uuid__": "845b1de6-648f-422a-8289-98222175b787"
+            }
+          },
+          {
+            "frame": 0.4166666666666667,
+            "value": {
+              "__uuid__": "df09902a-52d8-4dec-9d05-62d3428c4625"
+            }
+          },
+          {
+            "frame": 0.4666666666666667,
+            "value": {
+              "__uuid__": "da55a31c-ce4a-4003-a119-8c76fd6d1a80"
+            }
+          },
+          {
+            "frame": 0.5166666666666667,
+            "value": {
+              "__uuid__": "bd3f63fb-6d6d-47d2-9d96-2b58292fccfa"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

frontend/assets/resources/animation/MonkGirl/Atk4.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "168df303-4b6a-4376-940c-3d36fa9e98d8",
+  "subMetas": {}
+}

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

@@ -0,0 +1,55 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "Dashing",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.18333333333333332,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "b8c177cf-013e-4936-a031-2d3480cf975b"
+            }
+          },
+          {
+            "frame": 0.03333333333333333,
+            "value": {
+              "__uuid__": "ae2d8041-e7ee-4300-b3d6-3e85b146f33c"
+            }
+          },
+          {
+            "frame": 0.06666666666666667,
+            "value": {
+              "__uuid__": "f0518811-8fc9-4f9c-9ec4-401abdb3917d"
+            }
+          },
+          {
+            "frame": 0.1,
+            "value": {
+              "__uuid__": "3117e445-fe0f-425f-83af-5b719bf8a009"
+            }
+          },
+          {
+            "frame": 0.13333333333333333,
+            "value": {
+              "__uuid__": "f9d00d7d-2143-4893-be61-32cf1490c9f2"
+            }
+          },
+          {
+            "frame": 0.16666666666666666,
+            "value": {
+              "__uuid__": "daff32df-5e22-4d4e-94d2-6e4522a02138"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

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

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "d7b6d7c4-d2b5-49c6-bbcb-d8d80f52ae7e",
+  "subMetas": {}
+}

frontend/assets/resources/animation/MonkGirl/Dying.anim

@@ -0,0 +1,61 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "Dying",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.45,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "0b31e6af-6d24-4915-b87b-772c6eb10ca7"
+            }
+          },
+          {
+            "frame": 0.06666666666666667,
+            "value": {
+              "__uuid__": "c597fb09-4621-4d1f-abf9-6484405a6330"
+            }
+          },
+          {
+            "frame": 0.13333333333333333,
+            "value": {
+              "__uuid__": "8c8be852-b65d-41d8-800f-04cbb3cad094"
+            }
+          },
+          {
+            "frame": 0.2,
+            "value": {
+              "__uuid__": "f9522b47-812e-4020-845a-5d9f6d9aca90"
+            }
+          },
+          {
+            "frame": 0.26666666666666666,
+            "value": {
+              "__uuid__": "1ff63b81-49d8-4d68-9526-5f0dc4c88ef0"
+            }
+          },
+          {
+            "frame": 0.3333333333333333,
+            "value": {
+              "__uuid__": "4e96b6fd-2cd1-412b-98a8-7f22040af589"
+            }
+          },
+          {
+            "frame": 0.43333333333333335,
+            "value": {
+              "__uuid__": "a827896b-00b5-4385-9648-2c40414b29c3"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

frontend/assets/resources/animation/MonkGirl/Dying.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "86706adc-e079-4997-883b-3e269d223065",
+  "subMetas": {}
+}

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

@@ -0,0 +1,25 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "OnWall",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.016666666666666666,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "d5c1e6b4-1048-43e2-96f9-801dc23cf418"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

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

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "57358699-1d1b-44db-898c-df0c3ce9aab0",
+  "subMetas": {}
+}

frontend/assets/resources/pbfiles/room_downsync_frame.proto

@@ -37,6 +37,8 @@ message PlayerDownsync {
   int32 onWallNormY = 28;
 
   bool capturedByInertia = 29; // like "inAir", it’s by design a standalone field only inferred by the calc result of "applyInputFrameDownsyncDynamicsOnSingleRenderFrame" instead of "characterState"
+  int32 revivalVirtualGridX = 30;
+  int32 revivalVirtualGridY = 31;
 
   string name = 997;
   string displayName = 998;
@@ -73,18 +75,9 @@ message WsReq {
   int32 joinIndex = 4;
   int32 ackingFrameId = 5;
   int32 ackingInputFrameId = 6;
-  repeated InputFrameUpsync inputFrameUpsyncBatch = 7;
-  HeartbeatUpsync hb = 8;
-}
-
-message WsResp {
-  int32 ret = 1;
-  int32 echoedMsgId = 2;
-  int32 act = 3;
-  RoomDownsyncFrame rdf = 4;
-  repeated InputFrameDownsync inputFrameDownsyncBatch = 5;
-  BattleColliderInfo bciFrame = 6;
-  int32 peerJoinIndex = 7; // Only used when "InputsBufferSnapshot.peerJoinIndex" is used.
+  int32 authKey = 7;
+  repeated InputFrameUpsync inputFrameUpsyncBatch = 8;
+  HeartbeatUpsync hb = 9;
 }
 
 message InputsBufferSnapshot {
@@ -92,7 +85,7 @@ message InputsBufferSnapshot {
   uint64 unconfirmedMask = 2;
   repeated InputFrameDownsync toSendInputFrameDownsyncs = 3;
   bool shouldForceResync = 4;
-  int32 peerJoinIndex = 5; // Only used when "WsResp.peerJoinIndex" is used.
+  int32 peerJoinIndex = 5;
 }
 
 message MeleeBullet {
@@ -175,6 +168,18 @@ message FireballBullet {
   int32 speed = 1005;
 }
 
+message HolePunchUpsync {
+ string intAuthToken = 1;
+ int32 boundRoomId = 2;
+ int32 authKey = 3;
+}
+
+message PeerUdpAddr {
+ string ip = 1;
+ int32 port = 2;
+ int32 authKey = 3;
+}
+
 message BattleColliderInfo {
   string stageName = 1;
 
@@ -191,6 +196,8 @@ message BattleColliderInfo {
   double spaceOffsetX = 11;
   double spaceOffsetY = 12;
   int32 collisionMinStep = 13;
+  int32 boundRoomCapacity = 14;
+  PeerUdpAddr battleUdpTunnel = 15;
 
   bool frameDataLoggingEnabled = 1024;
 }
@@ -207,4 +214,15 @@ message RoomDownsyncFrame {
   repeated int32 speciesIdList = 1026;
 
   int32 bulletLocalIdCounter = 1027;
+  repeated PeerUdpAddr peerUdpAddrList = 1028;
+}
+
+message WsResp {
+  int32 ret = 1;
+  int32 echoedMsgId = 2;
+  int32 act = 3;
+  RoomDownsyncFrame rdf = 4;
+  repeated InputFrameDownsync inputFrameDownsyncBatch = 5;
+  BattleColliderInfo bciFrame = 6;
+  int32 peerJoinIndex = 7;
 }

frontend/assets/resources/prefabs/ControlledCharacter.prefab

@@ -25,16 +25,19 @@
       },
       {
         "__id__": 8
+      },
+      {
+        "__id__": 22
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 22
+        "__id__": 29
       }
     ],
     "_prefab": {
-      "__id__": 23
+      "__id__": 30
     },
     "_opacity": 255,
     "_color": {
@@ -324,8 +327,8 @@
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
-      "g": 255,
-      "b": 255,
+      "g": 0,
+      "b": 0,
       "a": 255
     },
     "_contentSize": {
@@ -483,12 +486,21 @@
       {
         "__uuid__": "e8247e2a-1b5b-4618-86f8-224b25246b55"
       },
-      null,
-      null,
-      null,
+      {
+        "__uuid__": "168df303-4b6a-4376-940c-3d36fa9e98d8"
+      },
       null,
+      {
+        "__uuid__": "d7b6d7c4-d2b5-49c6-bbcb-d8d80f52ae7e"
+      },
+      {
+        "__uuid__": "57358699-1d1b-44db-898c-df0c3ce9aab0"
+      },
       {
         "__uuid__": "6e1139d4-03dd-4bd4-9510-606e94f629fe"
+      },
+      {
+        "__uuid__": "86706adc-e079-4997-883b-3e269d223065"
       }
     ],
     "playOnLoad": false,
@@ -653,7 +665,9 @@
       {
         "__uuid__": "9b500cb0-8048-4715-81db-cc975c914225"
       },
-      null,
+      {
+        "__uuid__": "2aef91f9-ef47-4bb4-bf43-5441723aa639"
+      },
       null,
       {
         "__uuid__": "38b2c892-347b-4009-93f8-65b2ab1614f0"
@@ -663,6 +677,9 @@
       },
       {
         "__uuid__": "e906322d-a08b-4477-a2e9-98acd42fa034"
+      },
+      {
+        "__uuid__": "ac90c9b8-3b06-4866-89ce-2c953a9d5a9a"
       }
     ],
     "playOnLoad": false,
@@ -833,10 +850,15 @@
       {
         "__uuid__": "0abbd156-980e-475e-9994-3c958bd913fc"
       },
-      null,
+      {
+        "__uuid__": "337d57ad-118c-40e2-be90-2aa1505c152b"
+      },
       null,
       {
         "__uuid__": "edd23b2f-1caa-4836-88a7-e4af1f26743e"
+      },
+      {
+        "__uuid__": "657d4193-2224-44ea-94f7-0305a9f2b322"
       }
     ],
     "playOnLoad": false,
@@ -892,6 +914,244 @@
     "fileId": "7aN7Gcc/tBw5EGlTJVBj2+",
     "sync": false
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "HpBar",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 23
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 26
+      },
+      {
+        "__id__": 27
+      }
+    ],
+    "_prefab": {
+      "__id__": 28
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 50,
+      "height": 8
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        42.256,
+        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": "bar",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 22
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 24
+      }
+    ],
+    "_prefab": {
+      "__id__": 25
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 10,
+      "g": 252,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 50,
+      "height": 8
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -25,
+        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__": 23
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "67e68bc9-dad5-4ad9-a2d8-7e03d458e32f"
+    },
+    "_type": 1,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "59bff7a2-23e1-4d69-bce7-afb37eae196a"
+    },
+    "fileId": "1b5Rz5KABPK5Nv1wogghs6",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 22
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "88e79fd5-96b4-4a77-a1f4-312467171014"
+    },
+    "_type": 1,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ProgressBar",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 22
+    },
+    "_enabled": true,
+    "_N$totalLength": 50,
+    "_N$barSprite": {
+      "__id__": 24
+    },
+    "_N$mode": 0,
+    "_N$progress": 1,
+    "_N$reverse": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "59bff7a2-23e1-4d69-bce7-afb37eae196a"
+    },
+    "fileId": "1cDdFO9Z5KYIcRR52ZmtqO",
+    "sync": false
+  },
   {
     "__type__": "b74b05YDqZFRo4OkZRFZX8k",
     "_name": "",
@@ -910,6 +1170,9 @@
     "coordLabel": {
       "__id__": 3
     },
+    "hpBar": {
+      "__id__": 27
+    },
     "_id": ""
   },
   {

frontend/assets/resources/prefabs/Fireball.prefab

@@ -24,11 +24,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 12
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 13
+      "__id__": 21
     },
     "_opacity": 255,
     "_color": {
@@ -90,12 +90,18 @@
       },
       {
         "__id__": 7
+      },
+      {
+        "__id__": 11
+      },
+      {
+        "__id__": 15
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 11
+      "__id__": 19
     },
     "_opacity": 255,
     "_color": {
@@ -211,38 +217,6 @@
     "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": "",
@@ -265,6 +239,34 @@
     "playOnLoad": false,
     "_id": ""
   },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 3
+    },
+    "_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__": "6dcd5722-8ef9-47fd-9520-861d2713e274"
+    },
+    "_id": ""
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -278,7 +280,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "MeleeExplosion",
+    "_name": "Fireball2",
     "_objFlags": 0,
     "_parent": {
       "__id__": 2
@@ -314,6 +316,258 @@
       "x": 0.5,
       "y": 0.5
     },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0.5,
+        0.5,
+        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__": "d2c65ac4-a5b3-411e-8d2d-18d3980649d7"
+      },
+      {
+        "__uuid__": "14b92f5c-af81-416a-a162-e5822d20fe68"
+      }
+    ],
+    "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__": "725c90f9-56f8-48ea-9159-4d2949cd3ce0"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "d92d4831-cd65-4eb5-90bd-b77021aec35b"
+    },
+    "fileId": "b0ZpleOHlFqIjwc8HDI9df",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Fireball3",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 12
+      },
+      {
+        "__id__": 13
+      }
+    ],
+    "_prefab": {
+      "__id__": 14
+    },
+    "_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.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 11
+    },
+    "_enabled": true,
+    "_defaultClip": null,
+    "_clips": [
+      {
+        "__uuid__": "6aef5812-d16c-4da1-96a3-a38ac227c823"
+      },
+      {
+        "__uuid__": "0dbb90ed-a08a-448c-b06e-4831260e9213"
+      }
+    ],
+    "playOnLoad": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 11
+    },
+    "_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__": "579bc0c1-f5e2-4a5d-889b-9d567e53b0e6"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "d92d4831-cd65-4eb5-90bd-b77021aec35b"
+    },
+    "fileId": "03W6UmKHVAz4hCpMvTCpP9",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "MeleeExplosion",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 16
+      },
+      {
+        "__id__": 17
+      }
+    ],
+    "_prefab": {
+      "__id__": 18
+    },
+    "_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",
@@ -348,7 +602,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 7
+      "__id__": 15
     },
     "_enabled": true,
     "_defaultClip": null,
@@ -371,7 +625,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 7
+      "__id__": 15
     },
     "_enabled": true,
     "_materials": [],

frontend/assets/scenes/default_map.fire

@@ -77,6 +77,9 @@
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 49
+      },
       {
         "__id__": 50
       },
@@ -88,9 +91,6 @@
       },
       {
         "__id__": 53
-      },
-      {
-        "__id__": 54
       }
     ],
     "_prefab": null,
@@ -156,9 +156,6 @@
       },
       {
         "__id__": 5
-      },
-      {
-        "__id__": 49
       }
     ],
     "_prefab": null,
@@ -539,7 +536,7 @@
       "array": [
         0,
         0,
-        210.16474188040044,
+        216.50635094610968,
         0,
         0,
         0,
@@ -2301,24 +2298,6 @@
     "_originalHeight": 0,
     "_id": "2cxYjEIwNO6rUtXX4WcfnV"
   },
-  {
-    "__type__": "09e1b/tEy5K2qaPIpqHDbae",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 3
-    },
-    "_enabled": true,
-    "BGMEffect": null,
-    "crashedByTrapBullet": null,
-    "highScoreTreasurePicked": null,
-    "treasurePicked": null,
-    "countDown10SecToEnd": null,
-    "mapNode": {
-      "__id__": 3
-    },
-    "_id": "3crA1nz5xPSLAnCSLQIPOq"
-  },
   {
     "__type__": "cc.Canvas",
     "_name": "",
@@ -2360,7 +2339,7 @@
     "mapNode": {
       "__id__": 3
     },
-    "speed": 5000,
+    "speed": 500,
     "_id": "76ImpM7XtPSbiLHDXdsJa+"
   },
   {

frontend/assets/scenes/login.fire

@@ -72,22 +72,25 @@
         "__id__": 3
       },
       {
-        "__id__": 7
+        "__id__": 5
       },
       {
         "__id__": 9
+      },
+      {
+        "__id__": 11
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 60
-      },
-      {
-        "__id__": 61
-      },
       {
         "__id__": 62
+      },
+      {
+        "__id__": 63
+      },
+      {
+        "__id__": 64
       }
     ],
     "_prefab": null,
@@ -138,6 +141,102 @@
     "groupIndex": 0,
     "_id": "88kscZWXFCIZtNFekdSP/o"
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "Background",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 4
+      }
+    ],
+    "_prefab": null,
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 1280,
+      "height": 960
+    },
+    "_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": "c8r+ISXVhBZarylAeQMAQK"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "637f31c2-c53e-4dec-ae11-d56c0c6177ad"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": {
+      "__uuid__": "030d9286-e8a2-40cf-98f8-baf713f0b8c4"
+    },
+    "_id": "6dhdFxELpEwZ4TjXC+WnyS"
+  },
   {
     "__type__": "cc.Node",
     "_name": "Decorations",
@@ -147,13 +246,13 @@
     },
     "_children": [
       {
-        "__id__": 4
+        "__id__": 6
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 6
+        "__id__": 8
       }
     ],
     "_prefab": null,
@@ -209,13 +308,13 @@
     "_name": "Logo",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 3
+      "__id__": 5
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 5
+        "__id__": 7
       }
     ],
     "_prefab": null,
@@ -271,7 +370,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 4
+      "__id__": 6
     },
     "_enabled": true,
     "_materials": [
@@ -301,7 +400,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 3
+      "__id__": 5
     },
     "_enabled": true,
     "alignMode": 0,
@@ -334,7 +433,7 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 8
+        "__id__": 10
       }
     ],
     "_prefab": null,
@@ -362,7 +461,7 @@
       "array": [
         0,
         0,
-        216.6734179122529,
+        216.50635094610968,
         0,
         0,
         0,
@@ -390,7 +489,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 7
+      "__id__": 9
     },
     "_enabled": true,
     "_cullingMask": 4294967295,
@@ -430,13 +529,13 @@
     },
     "_children": [
       {
-        "__id__": 10
+        "__id__": 12
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 59
+        "__id__": 61
       }
     ],
     "_prefab": null,
@@ -492,41 +591,41 @@
     "_name": "InteractiveControls",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 9
+      "__id__": 11
     },
     "_children": [
       {
-        "__id__": 11
-      },
-      {
-        "__id__": 19
+        "__id__": 13
       },
       {
         "__id__": 21
       },
       {
-        "__id__": 30
+        "__id__": 23
       },
       {
         "__id__": 32
       },
       {
-        "__id__": 41
+        "__id__": 34
       },
       {
-        "__id__": 48
+        "__id__": 43
       },
       {
-        "__id__": 54
+        "__id__": 50
       },
       {
         "__id__": 56
+      },
+      {
+        "__id__": 58
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 58
+        "__id__": 60
       }
     ],
     "_prefab": null,
@@ -582,23 +681,23 @@
     "_name": "phoneCountryCodeInput",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [
-      {
-        "__id__": 12
-      },
       {
         "__id__": 14
       },
       {
         "__id__": 16
+      },
+      {
+        "__id__": 18
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 18
+        "__id__": 20
       }
     ],
     "_prefab": null,
@@ -654,13 +753,13 @@
     "_name": "BACKGROUND_SPRITE",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 11
+      "__id__": 13
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 13
+        "__id__": 15
       }
     ],
     "_prefab": null,
@@ -716,7 +815,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 12
+      "__id__": 14
     },
     "_enabled": true,
     "_materials": [
@@ -748,13 +847,13 @@
     "_name": "TEXT_LABEL",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 11
+      "__id__": 13
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 15
+        "__id__": 17
       }
     ],
     "_prefab": null,
@@ -810,7 +909,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 14
+      "__id__": 16
     },
     "_enabled": true,
     "_materials": [
@@ -840,13 +939,13 @@
     "_name": "PLACEHOLDER_LABEL",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 11
+      "__id__": 13
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 17
+        "__id__": 19
       }
     ],
     "_prefab": null,
@@ -902,7 +1001,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 16
+      "__id__": 18
     },
     "_enabled": true,
     "_materials": [],
@@ -928,7 +1027,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "_useOriginalSize": false,
@@ -941,13 +1040,13 @@
     "editingDidEnded": [],
     "editingReturn": [],
     "_N$textLabel": {
-      "__id__": 15
-    },
-    "_N$placeholderLabel": {
       "__id__": 17
     },
+    "_N$placeholderLabel": {
+      "__id__": 19
+    },
     "_N$background": {
-      "__id__": 13
+      "__id__": 15
     },
     "_N$inputFlag": 5,
     "_N$inputMode": 3,
@@ -959,13 +1058,13 @@
     "_name": "phoneLabel",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 22
       }
     ],
     "_prefab": null,
@@ -1021,7 +1120,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 21
     },
     "_enabled": true,
     "_materials": [
@@ -1051,23 +1150,23 @@
     "_name": "phoneNumberInput",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [
-      {
-        "__id__": 22
-      },
       {
         "__id__": 24
       },
       {
         "__id__": 26
+      },
+      {
+        "__id__": 28
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 29
+        "__id__": 31
       }
     ],
     "_prefab": null,
@@ -1123,13 +1222,13 @@
     "_name": "BACKGROUND_SPRITE",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 21
+      "__id__": 23
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 23
+        "__id__": 25
       }
     ],
     "_prefab": null,
@@ -1185,7 +1284,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 22
+      "__id__": 24
     },
     "_enabled": true,
     "_materials": [
@@ -1217,13 +1316,13 @@
     "_name": "TEXT_LABEL",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 21
+      "__id__": 23
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 27
       }
     ],
     "_prefab": null,
@@ -1279,7 +1378,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 26
     },
     "_enabled": true,
     "_materials": [],
@@ -1305,16 +1404,16 @@
     "_name": "PLACEHOLDER_LABEL",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 21
+      "__id__": 23
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 27
+        "__id__": 29
       },
       {
-        "__id__": 28
+        "__id__": 30
       }
     ],
     "_prefab": null,
@@ -1370,7 +1469,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 26
+      "__id__": 28
     },
     "_enabled": true,
     "_materials": [
@@ -1400,7 +1499,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 26
+      "__id__": 28
     },
     "_enabled": true,
     "_dataID": "login.hint.phoneInputHint",
@@ -1411,7 +1510,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 21
+      "__id__": 23
     },
     "_enabled": true,
     "_useOriginalSize": false,
@@ -1424,13 +1523,13 @@
     "editingDidEnded": [],
     "editingReturn": [],
     "_N$textLabel": {
-      "__id__": 25
-    },
-    "_N$placeholderLabel": {
       "__id__": 27
     },
+    "_N$placeholderLabel": {
+      "__id__": 29
+    },
     "_N$background": {
-      "__id__": 23
+      "__id__": 25
     },
     "_N$inputFlag": 5,
     "_N$inputMode": 1,
@@ -1442,13 +1541,13 @@
     "_name": " smsLoginCaptchaLabel",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 31
+        "__id__": 33
       }
     ],
     "_prefab": null,
@@ -1504,7 +1603,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 32
     },
     "_enabled": true,
     "_materials": [
@@ -1534,23 +1633,23 @@
     "_name": "smsLoginCaptchaInput",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [
-      {
-        "__id__": 33
-      },
       {
         "__id__": 35
       },
       {
         "__id__": 37
+      },
+      {
+        "__id__": 39
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 42
       }
     ],
     "_prefab": null,
@@ -1606,13 +1705,13 @@
     "_name": "BACKGROUND_SPRITE",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 32
+      "__id__": 34
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 36
       }
     ],
     "_prefab": null,
@@ -1668,7 +1767,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 33
+      "__id__": 35
     },
     "_enabled": true,
     "_materials": [
@@ -1700,13 +1799,13 @@
     "_name": "TEXT_LABEL",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 32
+      "__id__": 34
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 38
       }
     ],
     "_prefab": null,
@@ -1762,7 +1861,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 35
+      "__id__": 37
     },
     "_enabled": true,
     "_materials": [],
@@ -1788,16 +1887,16 @@
     "_name": "PLACEHOLDER_LABEL",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 32
+      "__id__": 34
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 40
       },
       {
-        "__id__": 39
+        "__id__": 41
       }
     ],
     "_prefab": null,
@@ -1853,7 +1952,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 37
+      "__id__": 39
     },
     "_enabled": true,
     "_materials": [
@@ -1883,7 +1982,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 37
+      "__id__": 39
     },
     "_enabled": true,
     "_dataID": "login.hint.captchaInputHint",
@@ -1894,7 +1993,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 32
+      "__id__": 34
     },
     "_enabled": true,
     "_useOriginalSize": false,
@@ -1907,13 +2006,13 @@
     "editingDidEnded": [],
     "editingReturn": [],
     "_N$textLabel": {
-      "__id__": 36
-    },
-    "_N$placeholderLabel": {
       "__id__": 38
     },
+    "_N$placeholderLabel": {
+      "__id__": 40
+    },
     "_N$background": {
-      "__id__": 34
+      "__id__": 36
     },
     "_N$inputFlag": 5,
     "_N$inputMode": 2,
@@ -1925,20 +2024,20 @@
     "_name": "smsLoginCaptchaButton",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [
       {
-        "__id__": 42
+        "__id__": 44
       },
       {
-        "__id__": 44
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 46
+        "__id__": 48
       }
     ],
     "_prefab": null,
@@ -1994,13 +2093,13 @@
     "_name": "smsGetCaptcha",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 41
+      "__id__": 43
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 43
+        "__id__": 45
       }
     ],
     "_prefab": null,
@@ -2056,7 +2155,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 42
+      "__id__": 44
     },
     "_enabled": true,
     "_materials": [
@@ -2090,13 +2189,13 @@
     "_name": "captchaLabel",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 41
+      "__id__": 43
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 47
       }
     ],
     "_prefab": null,
@@ -2152,7 +2251,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 44
+      "__id__": 46
     },
     "_enabled": true,
     "_materials": [
@@ -2182,7 +2281,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 41
+      "__id__": 43
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -2191,7 +2290,7 @@
     "zoomScale": 1.1,
     "clickEvents": [
       {
-        "__id__": 47
+        "__id__": 49
       }
     ],
     "_N$interactable": true,
@@ -2257,7 +2356,7 @@
       "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
     },
     "_N$target": {
-      "__id__": 41
+      "__id__": 43
     },
     "_id": "96L9tbxW9DHJHU5hUi9oNc"
   },
@@ -2276,20 +2375,20 @@
     "_name": "loginButton",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [
       {
-        "__id__": 49
+        "__id__": 51
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 51
+        "__id__": 53
       },
       {
-        "__id__": 52
+        "__id__": 54
       }
     ],
     "_prefab": null,
@@ -2345,13 +2444,13 @@
     "_name": "loginLabel",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 48
+      "__id__": 50
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 50
+        "__id__": 52
       }
     ],
     "_prefab": null,
@@ -2407,7 +2506,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 49
+      "__id__": 51
     },
     "_enabled": true,
     "_materials": [
@@ -2437,7 +2536,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 48
+      "__id__": 50
     },
     "_enabled": true,
     "_materials": [
@@ -2471,7 +2570,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 48
+      "__id__": 50
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -2480,7 +2579,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 53
+        "__id__": 55
       }
     ],
     "_N$interactable": true,
@@ -2546,7 +2645,7 @@
       "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
     },
     "_N$target": {
-      "__id__": 48
+      "__id__": 50
     },
     "_id": "0dQu3M5+hO8Ia4FD67Br39"
   },
@@ -2565,13 +2664,13 @@
     "_name": "phoneNumberTips",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 55
+        "__id__": 57
       }
     ],
     "_prefab": null,
@@ -2627,7 +2726,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 54
+      "__id__": 56
     },
     "_enabled": true,
     "_materials": [
@@ -2657,13 +2756,13 @@
     "_name": "captchaTips",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 57
+        "__id__": 59
       }
     ],
     "_prefab": null,
@@ -2719,7 +2818,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 56
+      "__id__": 58
     },
     "_enabled": true,
     "_materials": [
@@ -2749,7 +2848,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "alignMode": 1,
@@ -2776,7 +2875,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 9
+      "__id__": 11
     },
     "_enabled": true,
     "alignMode": 0,
@@ -2854,37 +2953,37 @@
       "__id__": 2
     },
     "backgroundNode": {
-      "__id__": 9
-    },
-    "interactiveControls": {
-      "__id__": 10
-    },
-    "phoneLabel": {
-      "__id__": 19
-    },
-    "smsLoginCaptchaLabel": {
-      "__id__": 30
-    },
-    "phoneCountryCodeInput": {
       "__id__": 11
     },
-    "phoneNumberInput": {
+    "interactiveControls": {
+      "__id__": 12
+    },
+    "phoneLabel": {
       "__id__": 21
     },
-    "phoneNumberTips": {
-      "__id__": 54
-    },
-    "smsLoginCaptchaInput": {
+    "smsLoginCaptchaLabel": {
       "__id__": 32
     },
-    "smsLoginCaptchaButton": {
-      "__id__": 41
+    "phoneCountryCodeInput": {
+      "__id__": 13
     },
-    "captchaTips": {
+    "phoneNumberInput": {
+      "__id__": 23
+    },
+    "phoneNumberTips": {
       "__id__": 56
     },
+    "smsLoginCaptchaInput": {
+      "__id__": 34
+    },
+    "smsLoginCaptchaButton": {
+      "__id__": 43
+    },
+    "captchaTips": {
+      "__id__": 58
+    },
     "loginButton": {
-      "__id__": 48
+      "__id__": 50
     },
     "smsWaitCountdownPrefab": {
       "__uuid__": "2c0101b8-c15a-4501-9fce-cd5a014af8bf"

frontend/assets/scenes/offline_map.fire

@@ -547,7 +547,7 @@
       "array": [
         0,
         0,
-        210.16474188040044,
+        216.50635094610968,
         0,
         0,
         0,
@@ -2313,7 +2313,7 @@
     "mapNode": {
       "__id__": 3
     },
-    "speed": 5000,
+    "speed": 500,
     "_id": "76ImpM7XtPSbiLHDXdsJa+"
   },
   {

frontend/assets/scripts/AttackingCharacter.js

@@ -19,6 +19,7 @@ window.ATK_CHARACTER_STATE = {
   Dashing: [15, "Dashing"],
   OnWall: [16, "OnWall"],
   TurnAround1: [17, "TurnAround1"],
+  Dying: [18, "Dying"],
 };
 
 window.ATK_CHARACTER_STATE_ARR = [];
@@ -75,10 +76,10 @@ cc.Class({
   onLoad() {
     BaseCharacter.prototype.onLoad.call(this);
     this.effAnimNode = this.animNode.getChildByName(this.speciesName);
-    this.animComp = this.effAnimNode.getComponent(dragonBones.ArmatureDisplay);
-    if (!this.animComp) {
-      this.animComp = this.effAnimNode.getComponent(cc.Animation);
-    }
+    //this.animComp = this.effAnimNode.getComponent(dragonBones.ArmatureDisplay);
+    //if (!this.animComp) {
+    this.animComp = this.effAnimNode.getComponent(cc.Animation);
+    //}
     this.effAnimNode.active = true;
   },
 
@@ -107,13 +108,13 @@ cc.Class({
     let playingAnimName = null;
     let underlyingAnimationCtrl = null;
 
-    if (this.animComp instanceof dragonBones.ArmatureDisplay) {
-      underlyingAnimationCtrl = this.animComp._armature.animation; // ALWAYS use the dragonBones api instead of ccc's wrapper!
-      playingAnimName = underlyingAnimationCtrl.lastAnimationName;
-    } else {
-      underlyingAnimationCtrl = this.animComp.currentClip;
-      playingAnimName = (!underlyingAnimationCtrl ? null : underlyingAnimationCtrl.name);
-    }
+    //if (this.animComp instanceof dragonBones.ArmatureDisplay) {
+    //  underlyingAnimationCtrl = this.animComp._armature.animation; // ALWAYS use the dragonBones api instead of ccc's wrapper!
+    //  playingAnimName = underlyingAnimationCtrl.lastAnimationName;
+    //} else {
+    underlyingAnimationCtrl = this.animComp.currentClip;
+    playingAnimName = (!underlyingAnimationCtrl ? null : underlyingAnimationCtrl.name);
+    //}
 
     // It turns out that "prevRdfPlayer.CharacterState" is not useful in this function :)
     if (newAnimName == playingAnimName && window.ATK_CHARACTER_STATE_INTERRUPT_WAIVE_SET.has(newCharacterState)) {
@@ -122,11 +123,11 @@ cc.Class({
       return;
     }
 
-    if (this.animComp instanceof dragonBones.ArmatureDisplay) {
-      this._interruptPlayingAnimAndPlayNewAnimDragonBones(rdfPlayer, prevRdfPlayer, newCharacterState, newAnimName, underlyingAnimationCtrl, playingAnimName, chConfig);
-    } else {
-      this._interruptPlayingAnimAndPlayNewAnimFrameAnim(rdfPlayer, prevRdfPlayer, newCharacterState, newAnimName, playingAnimName, chConfig);
-    }
+    //if (this.animComp instanceof dragonBones.ArmatureDisplay) {
+    //  this._interruptPlayingAnimAndPlayNewAnimDragonBones(rdfPlayer, prevRdfPlayer, newCharacterState, newAnimName, underlyingAnimationCtrl, playingAnimName, chConfig);
+    //} else {
+    this._interruptPlayingAnimAndPlayNewAnimFrameAnim(rdfPlayer, prevRdfPlayer, newCharacterState, newAnimName, playingAnimName, chConfig);
+    //}
   },
 
   _interruptPlayingAnimAndPlayNewAnimDragonBones(rdfPlayer, prevRdfPlayer, newCharacterState, newAnimName, underlyingAnimationCtrl, playingAnimName, chConfig) {

frontend/assets/scripts/CameraTracker.js

@@ -8,7 +8,7 @@ cc.Class({
     },
     speed: {
       type: cc.Float,
-      default: 500
+      default: 100
     },
   },
 
@@ -29,6 +29,15 @@ cc.Class({
     if (!selfPlayerRichInfo) return;
     const selfPlayerNode = selfPlayerRichInfo.node;
     if (!selfPlayerNode) return;
-    self.mapNode.setPosition(cc.v2().sub(selfPlayerNode.position));
+    const dst = cc.v2().sub(selfPlayerNode.position);
+    const pDiff = dst.sub(self.mapNode.position);
+    const stepLength = dt * self.speed;
+    if (stepLength > pDiff.mag()) {
+      self.mapNode.setPosition(dst);
+    } else {
+      pDiff.normalizeSelf();
+      const newMapPos = self.mapNode.position.add(pDiff.mul(dt * self.speed));
+      self.mapNode.setPosition(newMapPos);
+    }
   }
 });

frontend/assets/scripts/ControlledCharacter.js

@@ -10,7 +10,11 @@ cc.Class({
     coordLabel: {
       type: cc.Label,
       default: null
-    }
+    },
+    hpBar: {
+      type: cc.ProgressBar,
+      default: null
+    },
   },
 
   onLoad() {

frontend/assets/scripts/FindingPlayer.js

@@ -23,7 +23,8 @@ cc.Class({
   // LIFE-CYCLE CALLBACKS:
   onLoad() {},
 
-  init() {
+  init(mapIns) {
+    this.mapIns = mapIns;
     if (null != this.firstPlayerInfoNode) {
       this.firstPlayerInfoNode.active = false;
     }
@@ -53,9 +54,10 @@ cc.Class({
   },
 
   exitBtnOnClick(evt) {
-    window.clearBoundRoomIdInBothVolatileAndPersistentStorage();
-    window.closeWSConnection();
-    cc.director.loadScene('login');
+    this.mapIns.hideFindingPlayersGUI();
+    cc.log(`FindingPlayers.exitBtnOnClick`);
+    window.closeWSConnection(constants.RET_CODE.BATTLE_STOPPED, "");
+    window.clearLocalStorageAndBackToLoginScene(false);
   },
 
   updatePlayersInfo(playerMetas) {

frontend/assets/scripts/Map.js

@@ -34,6 +34,23 @@ window.PlayerBattleState = {
   EXPELLED_IN_DISMISSAL: 6
 };
 
+window.onUdpMessage = (args) => {
+  const self = window.mapIns;
+  const ui8Arr = args;
+  //cc.log(`#1 Js called back by CPP: onUdpMessage: args=${args}, typeof(args)=${typeof (args)}, argslen=${args.length}, ui8Arr=${ui8Arr}`);
+  const req = window.pb.protos.WsReq.decode(ui8Arr);
+  if (req) {
+    //cc.log(`#2 Js called back by CPP for upsync: onUdpMessage: ${JSON.stringify(req)}`);
+    if (req.act && window.UPSYNC_MSG_ACT_PLAYER_CMD == req.act) {
+      let effCnt = 0;
+      const peerJoinIndex = req.joinIndex;
+      if (peerJoinIndex == self.selfPlayerInfo.JoinIndex) return;
+      const batch = req.inputFrameUpsyncBatch;
+      self.onPeerInputFrameUpsync(peerJoinIndex, batch, true);
+    }
+  }
+};
+
 cc.Class({
   extends: cc.Component,
 
@@ -127,7 +144,7 @@ cc.Class({
     return (confirmedList + 1) == (1 << this.playerRichInfoDict.size);
   },
 
-  getOrPrefabInputFrameUpsync(inputFrameId) {
+  getOrPrefabInputFrameUpsync(inputFrameId, canConfirmSelf) {
     // TODO: find some kind of synchronization mechanism against "onInputFrameDownsyncBatch"!
     const self = this;
     if (
@@ -140,33 +157,48 @@ cc.Class({
     let previousSelfInput = null,
       currSelfInput = null;
     const joinIndex = self.selfPlayerInfo.JoinIndex;
+    const selfJoinIndexMask = (1 << (joinIndex - 1));
     const existingInputFrame = self.recentInputCache.GetByFrameId(inputFrameId);
     const previousInputFrameDownsync = self.recentInputCache.GetByFrameId(inputFrameId - 1);
     previousSelfInput = (null == previousInputFrameDownsync ? null : previousInputFrameDownsync.InputList[joinIndex - 1]);
-    if (null != existingInputFrame) {
+    if (
+      null != existingInputFrame
+      &&
+      (true != canConfirmSelf)
+    ) {
       // 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)}`);
       return [previousSelfInput, existingInputFrame.InputList[joinIndex - 1]];
     }
 
-    const lastAllConfirmedInputFrame = self.recentInputCache.GetByFrameId(self.lastAllConfirmedInputFrameId);
     const prefabbedInputList = new Array(self.playerRichInfoDict.size).fill(0);
     // the returned "gopkgs.NewInputFrameDownsync.InputList" is immutable, thus we can only modify the values in "prefabbedInputList"
-    for (let k in prefabbedInputList) {
-      if (null != previousInputFrameDownsync) {
+    for (let k = 0; k < window.boundRoomCapacity; ++k) {
+      if (null != existingInputFrame) {
+        // When "null != existingInputFrame", it implies that "true == canConfirmSelf" here, we just have to assign "prefabbedInputList[(joinIndex-1)]" specifically and copy all others
+        prefabbedInputList[k] = existingInputFrame.InputList[k];
+      } else if (self.lastIndividuallyConfirmedInputFrameId[k] <= inputFrameId) {
+        prefabbedInputList[k] = self.lastIndividuallyConfirmedInputList[k];
+        // Don't predict "btnA & btnB"!
+        prefabbedInputList[k] = (prefabbedInputList[k] & 15);
+      } else if (null != previousInputFrameDownsync) {
+        // When "self.lastIndividuallyConfirmedInputFrameId[k] > inputFrameId", don't use it to predict a historical input!
         prefabbedInputList[k] = previousInputFrameDownsync.InputList[k];
+        // Don't predict "btnA & btnB"!
+        prefabbedInputList[k] = (prefabbedInputList[k] & 15);
       }
-      if (0 <= self.lastAllConfirmedInputFrameId && inputFrameId - 1 > self.lastAllConfirmedInputFrameId) {
-        prefabbedInputList[k] = lastAllConfirmedInputFrame.InputList[k];
-      }
-      // Don't predict "btnA & btnB"!
-      prefabbedInputList[k] = (prefabbedInputList[k] & 15);
+    }
+    let initConfirmedList = 0;
+    if (null != existingInputFrame) {
+      // When "null != existingInputFrame", it implies that "true == canConfirmSelf" here
+      initConfirmedList = (existingInputFrame.ConfirmedList | selfJoinIndexMask);
     }
     currSelfInput = self.ctrl.getEncodedInput(); // When "null == existingInputFrame", it'd be safe to say that the realtime "self.ctrl.getEncodedInput()" is for the requested "inputFrameId"
     prefabbedInputList[(joinIndex - 1)] = currSelfInput;
     while (self.recentInputCache.EdFrameId <= inputFrameId) {
       // Fill the gap
-      const prefabbedInputFrameDownsync = gopkgs.NewInputFrameDownsync(self.recentInputCache.EdFrameId, prefabbedInputList.slice(), (1 << (joinIndex - 1)));
+      // [WARNING] Do not blindly use "selfJoinIndexMask" here, as the "actuallyUsedInput for self" couldn't be confirmed while prefabbing, otherwise we'd have confirmed a wrong self input by "_markConfirmationIfApplicable()"!
+      const prefabbedInputFrameDownsync = gopkgs.NewInputFrameDownsync(self.recentInputCache.EdFrameId, prefabbedInputList.slice(), initConfirmedList);
       // console.log(`Prefabbed inputFrameId=${prefabbedInputFrameDownsync.InputFrameId}`);
       self.recentInputCache.Put(prefabbedInputFrameDownsync);
     }
@@ -217,7 +249,11 @@ cc.Class({
       joinIndex: self.selfPlayerInfo.JoinIndex,
       ackingInputFrameId: self.lastAllConfirmedInputFrameId,
       inputFrameUpsyncBatch: inputFrameUpsyncBatch,
+      authKey: self.selfPlayerInfo.udpTunnelAuthKey,
     }).finish();
+    if (cc.sys.isNative) {
+      DelayNoMore.UdpSession.broadcastInputFrameUpsync(reqData, window.boundRoomCapacity, self.selfPlayerInfo.JoinIndex);
+    }
     window.sendSafely(reqData);
     self.lastUpsyncInputFrameId = latestLocalInputFrameId;
     if (self.lastUpsyncInputFrameId >= self.recentInputCache.EdFrameId) {
@@ -334,9 +370,10 @@ cc.Class({
     self.lastUpsyncInputFrameId = -1;
     self.chaserRenderFrameId = -1; // at any moment, "chaserRenderFrameId <= renderFrameId", but "chaserRenderFrameId" would fluctuate according to "onInputFrameDownsyncBatch"
 
+    self.lastIndividuallyConfirmedInputFrameId = new Array(window.boundRoomCapacity).fill(-1);
+    self.lastIndividuallyConfirmedInputList = new Array(window.boundRoomCapacity).fill(0);
     self.recentRenderCache = new RingBuffer(self.renderCacheSize);
 
-    self.selfPlayerInfo = null; // This field is kept for distinguishing "self" and "others".
     self.recentInputCache = gopkgs.NewRingBufferJs((self.renderCacheSize >> 1) + 1);
 
     self.gopkgsCollisionSys = gopkgs.NewCollisionSpaceJs((self.spaceOffsetX << 1), (self.spaceOffsetY << 1), self.collisionMinStep, self.collisionMinStep);
@@ -357,14 +394,12 @@ cc.Class({
     self.networkDoctor = new NetworkDoctor(20);
     self.skipRenderFrameFlag = false;
 
+    self.allowRollbackOnPeerUpsync = true;
+
     self.countdownNanos = null;
     if (self.countdownLabel) {
       self.countdownLabel.string = "";
     }
-    if (self.findingPlayerNode) {
-      const findingPlayerScriptIns = self.findingPlayerNode.getComponent("FindingPlayer");
-      findingPlayerScriptIns.init();
-    }
     if (self.playersInfoNode) {
       safelyAddChild(self.widgetsAboveAllNode, self.playersInfoNode);
     }
@@ -471,7 +506,7 @@ cc.Class({
     self.findingPlayerNode.width = self.canvasNode.width;
     self.findingPlayerNode.height = self.canvasNode.height;
     const findingPlayerScriptIns = self.findingPlayerNode.getComponent("FindingPlayer");
-    findingPlayerScriptIns.init();
+    findingPlayerScriptIns.init(self);
 
     self.playersInfoNode = cc.instantiate(self.playersInfoPrefab);
 
@@ -493,6 +528,7 @@ cc.Class({
       console.log(`Received parsedBattleColliderInfo via ws`);
       // TODO: Upon reconnection, the backend might have already been sending down data that'd trigger "onRoomDownsyncFrame & onInputFrameDownsyncBatch", but frontend could reject those data due to "battleState != PlayerBattleState.ACTIVE".
       Object.assign(self, parsedBattleColliderInfo);
+      self.inputFrameUpsyncDelayTolerance = parsedBattleColliderInfo.inputFrameUpsyncDelayTolerance;
 
       const tiledMapIns = self.node.getComponent(cc.TiledMap);
 
@@ -500,7 +536,7 @@ cc.Class({
       const fullPathOfTmxFile = cc.js.formatStr("map/%s/map", parsedBattleColliderInfo.stageName);
       cc.loader.loadRes(fullPathOfTmxFile, cc.TiledMapAsset, (err, tmxAsset) => {
         if (null != err) {
-          console.error(err);
+          console.error(`Error occurred when loading tiled stage ${parsedBattleColliderInfo.stageName}`, err);
           return;
         }
 
@@ -549,10 +585,6 @@ cc.Class({
           const collisionBarrierIndex = (self.collisionBarrierIndexPrefix + barrierIdCounter);
           self.gopkgsCollisionSysMap[collisionBarrierIndex] = newBarrierCollider;
         }
-        self.selfPlayerInfo = JSON.parse(cc.sys.localStorage.getItem('selfPlayer'));
-        Object.assign(self.selfPlayerInfo, {
-          Id: self.selfPlayerInfo.playerId
-        });
         self.initDebugDrawers();
         const reqData = window.pb.protos.WsReq.encode({
           msgId: Date.now(),
@@ -626,7 +658,7 @@ 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, pbPlayer.onWall, pbPlayer.onWallNormX, pbPlayer.onWallNormY, pbPlayer.capturedByInertia, pbPlayer.bulletTeamId, pbPlayer.chCollisionTeamId);
+      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.capturedByInertia, pbPlayer.bulletTeamId, pbPlayer.chCollisionTeamId, pbPlayer.revivalVirtualGridX, pbPlayer.revivalVirtualGridY);
       jsPlayersArr[k] = jsPlayer;
     }
     const jsMeleeBulletsArr = new Array(pbRdf.meleeBullets.length).fill(null);
@@ -703,6 +735,7 @@ cc.Class({
         self.hideFindingPlayersGUI();
         console.warn('On battle resynced! renderFrameId=', rdf.Id);
       }
+
       self.renderFrameId = rdf.Id;
       self.lastRenderFrameIdTriggeredAt = performance.now();
       // In this case it must be true that "rdf.id > chaserRenderFrameId".
@@ -713,11 +746,16 @@ cc.Class({
       self.ctrl = canvasNode.getComponent("TouchEventsManager");
       self.enableInputControls();
       self.transitToState(ALL_MAP_STATES.VISUAL);
+
+      const selfPlayerRichInfo = self.playerRichInfoDict.get(self.selfPlayerInfo.Id);
+      const newMapPos = cc.v2().sub(selfPlayerRichInfo.node.position);
+      self.node.setPosition(newMapPos);
       self.battleState = ALL_BATTLE_STATES.IN_BATTLE;
     }
 
+    // [WARNING] "cc.Node.removeChild" would trigger massive update of rendering nodes, thus a performance impact at the beginning of battle, avoid it by just moving the widget to infinitely far away!  
     if (self.countdownToBeginGameNode && self.countdownToBeginGameNode.parent) {
-      self.countdownToBeginGameNode.parent.removeChild(self.countdownToBeginGameNode);
+      self.countdownToBeginGameNode.setPosition(cc.v2(Number.MAX_VALUE, Number.MAX_VALUE));
     }
 
     if (null != self.musicEffectManagerScriptIns) {
@@ -801,6 +839,19 @@ cc.Class({
     return true;
   },
 
+  _markConfirmationIfApplicable() {
+    const self = this;
+    let newAllConfirmedCnt = 0;
+    while (self.recentInputCache.StFrameId <= self.lastAllConfirmedInputFrameId && self.lastAllConfirmedInputFrameId < self.recentInputCache.EdFrameId) {
+      const inputFrameDownsync = self.recentInputCache.GetByFrameId(self.lastAllConfirmedInputFrameId);
+      if (null == inputFrameDownsync) break;
+      if (self._allConfirmed(inputFrameDownsync.ConfirmedList)) break;
+      ++self.lastAllConfirmedInputFrameId;
+      ++newAllConfirmedCnt;
+    }
+    return newAllConfirmedCnt;
+  },
+
   onInputFrameDownsyncBatch(batch /* []*pb.InputFrameDownsync */ ) {
     // TODO: find some kind of synchronization mechanism against "getOrPrefabInputFrameUpsync"!
     if (null == batch) {
@@ -822,8 +873,9 @@ cc.Class({
       if (inputFrameDownsyncId <= self.lastAllConfirmedInputFrameId) {
         continue;
       }
-      // [WARNING] Take all "inputFrameDownsync" from backend as all-confirmed, it'll be later checked by "rollbackAndChase". 
+      // [WARNING] Now that "inputFrameDownsyncId > self.lastAllConfirmedInputFrameId", we should make an update immediately because unlike its backend counterpart "Room.LastAllConfirmedInputFrameId", the frontend "mapIns.lastAllConfirmedInputFrameId" might inevitably get gaps among discrete values due to "either type#1 or type#2 forceConfirmation" -- and only "onInputFrameDownsyncBatch" can catch this! 
       self.lastAllConfirmedInputFrameId = inputFrameDownsyncId;
+
       const localInputFrame = self.recentInputCache.GetByFrameId(inputFrameDownsyncId);
       if (null != localInputFrame
         &&
@@ -833,16 +885,29 @@ cc.Class({
       ) {
         firstPredictedYetIncorrectInputFrameId = inputFrameDownsyncId;
       }
+      // [WARNING] Take all "inputFrameDownsync" from backend as all-confirmed, it'll be later checked by "rollbackAndChase". 
       inputFrameDownsync.confirmedList = (1 << self.playerRichInfoDict.size) - 1;
       const inputFrameDownsyncLocal = gopkgs.NewInputFrameDownsync(inputFrameDownsync.inputFrameId, inputFrameDownsync.inputList, inputFrameDownsync.confirmedList); // "battle.InputFrameDownsync" in "jsexport"
+      for (let j in self.playerRichInfoArr) {
+        const jj = parseInt(j);
+        if (inputFrameDownsync.inputFrameId > self.lastIndividuallyConfirmedInputFrameId[jj]) {
+          self.lastIndividuallyConfirmedInputFrameId[jj] = inputFrameDownsync.inputFrameId;
+          self.lastIndividuallyConfirmedInputList[jj] = inputFrameDownsync.inputList[jj];
+        }
+      }
       //console.log(`Confirmed inputFrameId=${inputFrameDownsync.inputFrameId}`);
       const [ret, oldStFrameId, oldEdFrameId] = self.recentInputCache.SetByFrameId(inputFrameDownsyncLocal, inputFrameDownsync.inputFrameId);
       if (window.RING_BUFF_FAILED_TO_SET == ret) {
         throw `Failed to dump input cache (maybe recentInputCache too small)! inputFrameDownsync.inputFrameId=${inputFrameDownsync.inputFrameId}, lastAllConfirmedInputFrameId=${self.lastAllConfirmedInputFrameId}; recentRenderCache=${self._stringifyRecentRenderCache(false)}, recentInputCache=${self._stringifyRecentInputCache(false)}`;
       }
     }
+    self._markConfirmationIfApplicable();
+    self._handleIncorrectlyRenderedPrediction(firstPredictedYetIncorrectInputFrameId, batch, false);
+  },
 
+  _handleIncorrectlyRenderedPrediction(firstPredictedYetIncorrectInputFrameId, batch, fromUDP) {
     if (null == firstPredictedYetIncorrectInputFrameId) return;
+    const self = this;
     const renderFrameId1 = gopkgs.ConvertToFirstUsedRenderFrameId(firstPredictedYetIncorrectInputFrameId) - 1;
     if (renderFrameId1 >= self.chaserRenderFrameId) return;
 
@@ -858,15 +923,21 @@ cc.Class({
     --------------------------------------------------------
     */
     // The actual rollback-and-chase would later be executed in update(dt). 
-    console.log(`Mismatched input detected, resetting chaserRenderFrameId: ${self.chaserRenderFrameId}->${renderFrameId1} by firstPredictedYetIncorrectInputFrameId: ${firstPredictedYetIncorrectInputFrameId}
+    console.log(`Mismatched input detected, resetting chaserRenderFrameId: ${self.chaserRenderFrameId}->${renderFrameId1} by 
+firstPredictedYetIncorrectInputFrameId: ${firstPredictedYetIncorrectInputFrameId}
 lastAllConfirmedInputFrameId=${self.lastAllConfirmedInputFrameId}
 recentInputCache=${self._stringifyRecentInputCache(false)}
-batchInputFrameIdRange=[${batch[0].inputFrameId}, ${batch[batch.length - 1].inputFrameId}]`);
+batchInputFrameIdRange=[${batch[0].inputFrameId}, ${batch[batch.length - 1].inputFrameId}]
+fromUDP=${fromUDP}`);
     self.chaserRenderFrameId = renderFrameId1;
-    self.networkDoctor.logRollbackFrames(self.renderFrameId - self.chaserRenderFrameId);
+    let rollbackFrames = (self.renderFrameId - self.chaserRenderFrameId);
+    if (0 > rollbackFrames) {
+      rollbackFrames = 0;
+    }
+    self.networkDoctor.logRollbackFrames(rollbackFrames);
   },
 
-  onPeerInputFrameUpsync(peerJoinIndex, batch /* []*pb.InputFrameDownsync */ ) {
+  onPeerInputFrameUpsync(peerJoinIndex, batch, fromUDP) {
     // TODO: find some kind of synchronization mechanism against "getOrPrefabInputFrameUpsync"!
     // See `<proj-root>/ConcerningEdgeCases.md` for why this method exists.
     if (null == batch) {
@@ -876,27 +947,64 @@ batchInputFrameIdRange=[${batch[0].inputFrameId}, ${batch[batch.length - 1].inpu
     if (!self.recentInputCache) {
       return;
     }
-    if (ALL_BATTLE_STATES.IN_SETTLEMENT == self.battleState) {
+    if (ALL_BATTLE_STATES.IN_BATTLE != self.battleState) {
       return;
     }
 
     let effCnt = 0;
     //console.log(`Received peer inputFrameUpsync batch w/ inputFrameId in [${batch[0].inputFrameId}, ${batch[batch.length - 1].inputFrameId}] for prediction assistance`);
+    let firstPredictedYetIncorrectInputFrameId = null;
+    const renderedInputFrameIdUpper = gopkgs.ConvertToDelayedInputFrameId(self.renderFrameId);
     for (let k in batch) {
-      const inputFrameDownsync = batch[k];
-      const inputFrameDownsyncId = inputFrameDownsync.inputFrameId;
-      if (inputFrameDownsyncId <= self.lastAllConfirmedInputFrameId) {
+      const inputFrame = batch[k]; // could be either "pb.InputFrameDownsync" or "pb.InputFrameUpsync", depending on "fromUDP"
+      const inputFrameId = inputFrame.inputFrameId;
+      const peerEncodedInput = (true == fromUDP ? inputFrame.encoded : inputFrame.inputList[peerJoinIndex - 1]);
+      if (false == self.allowRollbackOnPeerUpsync && inputFrameId <= renderedInputFrameIdUpper) {
+        // [WARNING] Avoid obfuscating already rendered history, even at "inputFrameId == renderedInputFrameIdUpper", due to the use of "INPUT_SCALE_FRAMES" some previous render frames might already be rendered with "inputFrameId"!   
         continue;
       }
+      if (inputFrameId <= self.lastAllConfirmedInputFrameId) {
+        // [WARNING] Don't reject it by "inputFrameId <= self.lastIndividuallyConfirmedInputFrameId[peerJoinIndex-1]", the arrival of UDP packets might not reserve their sending order!
+        continue;
+      }
+      const peerJoinIndexMask = (1 << (peerJoinIndex - 1));
+      self.getOrPrefabInputFrameUpsync(inputFrameId, false); // Make sure that inputFrame exists locally
+      const existingInputFrame = self.recentInputCache.GetByFrameId(inputFrameId);
+      if (0 < (existingInputFrame.ConfirmedList & peerJoinIndexMask)) {
+        continue;
+      }
+      if (inputFrameId > self.lastIndividuallyConfirmedInputFrameId[peerJoinIndex - 1]) {
+        self.lastIndividuallyConfirmedInputFrameId[peerJoinIndex - 1] = inputFrameId;
+        self.lastIndividuallyConfirmedInputList[peerJoinIndex - 1] = peerEncodedInput;
+      }
       effCnt += 1;
-      self.getOrPrefabInputFrameUpsync(inputFrameDownsyncId); // Make sure that inputFrame exists locally
-      const existingInputFrame = self.recentInputCache.GetByFrameId(inputFrameDownsyncId);
-      existingInputFrame.InputList[peerJoinIndex - 1] = inputFrameDownsync.inputList[peerJoinIndex - 1]; // No need to change "confirmedList", leave it to "onInputFrameDownsyncBatch" -- we're just helping prediction here
-      self.recentInputCache.SetByFrameId(existingInputFrame, inputFrameDownsyncId);
+      // the returned "gopkgs.NewInputFrameDownsync.InputList" is immutable, thus we can only modify the values in "newInputList" and "newConfirmedList"!
+      let newInputList = existingInputFrame.InputList.slice();
+      newInputList[peerJoinIndex - 1] = peerEncodedInput;
+      let newConfirmedList = (existingInputFrame.ConfirmedList | peerJoinIndex);
+      const newInputFrameDownsyncLocal = gopkgs.NewInputFrameDownsync(inputFrameId, newInputList, newConfirmedList);
+      //console.log(`Updated encoded input of peerJoinIndex=${peerJoinIndex} to ${peerEncodedInput} for inputFrameId=${inputFrameId}/renderedInputFrameIdUpper=${renderedInputFrameIdUpper} from ${JSON.stringify(inputFrame)}; newInputFrameDownsyncLocal=${self.gopkgsInputFrameDownsyncStr(newInputFrameDownsyncLocal)}; existingInputFrame=${self.gopkgsInputFrameDownsyncStr(existingInputFrame)}`);
+      self.recentInputCache.SetByFrameId(newInputFrameDownsyncLocal, inputFrameId);
+
+      if (self.allowRollbackOnPeerUpsync) {
+        // Reaching here implies that "true == self.allowRollbackOnPeerUpsync".
+        // Shall we update the "chaserRenderFrameId" if the rendered history was wrong? It doesn't seem to impact eventual correctness if we allow the update of "chaserRenderFrameId" upon "inputFrameId <= renderedInputFrameIdUpper" here, however UDP upsync doesn't reserve order from a same sender and there might be multiple other senders, hence it might result in unnecessarily frequent chasing.
+        if (
+          null == firstPredictedYetIncorrectInputFrameId
+          &&
+          existingInputFrame.InputList[peerJoinIndex - 1] != peerEncodedInput
+        ) {
+          firstPredictedYetIncorrectInputFrameId = inputFrameId;
+        }
+      }
     }
     if (0 < effCnt) {
+      //self._markConfirmationIfApplicable();
       self.networkDoctor.logPeerInputFrameUpsync(batch[0].inputFrameId, batch[batch.length - 1].inputFrameId);
     }
+    if (true == self.allowRollbackOnPeerUpsync) {
+      self._handleIncorrectlyRenderedPrediction(firstPredictedYetIncorrectInputFrameId, batch, fromUDP);
+    }
   },
 
   onPlayerAdded(rdf /* pb.RoomDownsyncFrame */ ) {
@@ -914,8 +1022,7 @@ batchInputFrameIdRange=[${batch[0].inputFrameId}, ${batch[batch.length - 1].inpu
     if (ALL_BATTLE_STATES.IN_BATTLE != self.battleState) {
       return;
     }
-    self._stringifyRdfIdToActuallyUsedInput();
-    window.closeWSConnection(constants.RET_CODE.BATTLE_STOPPED);
+    window.closeWSConnection(constants.RET_CODE.BATTLE_STOPPED, "");
     self.battleState = ALL_BATTLE_STATES.IN_SETTLEMENT;
     self.countdownNanos = null;
     if (self.musicEffectManagerScriptIns) {
@@ -981,13 +1088,13 @@ batchInputFrameIdRange=[${batch[0].inputFrameId}, ${batch[batch.length - 1].inpu
         let prevSelfInput = null,
           currSelfInput = null;
         if (gopkgs.ShouldGenerateInputFrameUpsync(self.renderFrameId)) {
-          [prevSelfInput, currSelfInput] = self.getOrPrefabInputFrameUpsync(noDelayInputFrameId);
+          [prevSelfInput, currSelfInput] = self.getOrPrefabInputFrameUpsync(noDelayInputFrameId, true);
         }
 
         const delayedInputFrameId = gopkgs.ConvertToDelayedInputFrameId(self.renderFrameId);
         if (null == self.recentInputCache.GetByFrameId(delayedInputFrameId)) {
           // Possible edge case after resync, kindly note that it's OK to prefab a "future inputFrame" here, because "sendInputFrameUpsyncBatch" would be capped by "noDelayInputFrameId from self.renderFrameId". 
-          self.getOrPrefabInputFrameUpsync(delayedInputFrameId);
+          self.getOrPrefabInputFrameUpsync(delayedInputFrameId, false);
         }
 
         let t0 = performance.now();
@@ -1011,7 +1118,12 @@ batchInputFrameIdRange=[${batch[0].inputFrameId}, ${batch[batch.length - 1].inpu
 
         // Inside the following "self.rollbackAndChase" actually ROLLS FORWARD w.r.t. the corresponding delayedInputFrame, REGARDLESS OF whether or not "self.chaserRenderFrameId == self.renderFrameId" now. 
         const latestRdfResults = self.rollbackAndChase(self.renderFrameId, self.renderFrameId + 1, self.gopkgsCollisionSys, self.gopkgsCollisionSysMap, false);
-        self.networkDoctor.logRollbackFrames(self.renderFrameId - self.chaserRenderFrameId);
+
+        let rollbackFrames = (self.renderFrameId - self.chaserRenderFrameId);
+        if (0 > rollbackFrames) {
+          rollbackFrames = 0;
+        }
+        self.networkDoctor.logRollbackFrames(rollbackFrames);
         let prevRdf = latestRdfResults[0],
           rdf = latestRdfResults[1];
         /*
@@ -1042,7 +1154,7 @@ othersForcedDownsyncRenderFrame=${JSON.stringify(othersForcedDownsyncRenderFrame
         ++self.renderFrameId; // [WARNING] It's important to increment the renderFrameId AFTER all the operations above!!!
         self.lastRenderFrameIdTriggeredAt = performance.now();
         let t3 = performance.now();
-        self.skipRenderFrameFlag = self.networkDoctor.isTooFast();
+        self.skipRenderFrameFlag = self.networkDoctor.isTooFast(self);
       } catch (err) {
         console.error("Error during Map.update", err);
         self.onBattleStopped(); // TODO: Popup to ask player to refresh browser
@@ -1066,6 +1178,7 @@ othersForcedDownsyncRenderFrame=${JSON.stringify(othersForcedDownsyncRenderFrame
   logout(byClick /* The case where this param is "true" will be triggered within `ConfirmLogout.js`.*/ , shouldRetainBoundRoomIdInBothVolatileAndPersistentStorage) {
     const self = this;
     const localClearance = () => {
+      window.closeWSConnection(constants.RET_CODE.BATTLE_STOPPED, "");
       window.clearLocalStorageAndBackToLoginScene(shouldRetainBoundRoomIdInBothVolatileAndPersistentStorage);
     }
 
@@ -1132,8 +1245,10 @@ othersForcedDownsyncRenderFrame=${JSON.stringify(othersForcedDownsyncRenderFrame
 
   hideFindingPlayersGUI(rdf) {
     const self = this;
-    if (null == self.findingPlayerNode.parent) return;
-    self.findingPlayerNode.parent.removeChild(self.findingPlayerNode);
+    // [WARNING] "cc.Node.removeChild" would trigger massive update of rendering nodes, thus a performance impact at the beginning of battle, avoid it by just moving the widget to infinitely far away!  
+    if (self.findingPlayerNode && self.findingPlayerNode.parent) {
+      self.findingPlayerNode.setPosition(cc.v2(Number.MAX_VALUE, Number.MAX_VALUE));
+    }
   },
 
   onBattleReadyToStart(rdf /* pb.RoomDownsyncFrame */ ) {
@@ -1177,6 +1292,7 @@ othersForcedDownsyncRenderFrame=${JSON.stringify(othersForcedDownsyncRenderFrame
       playerRichInfo.node.setPosition(wx, wy);
       playerRichInfo.scriptIns.updateSpeed(currPlayerDownsync.Speed);
       playerRichInfo.scriptIns.updateCharacterAnim(currPlayerDownsync, prevRdfPlayer, false, chConfig);
+      playerRichInfo.scriptIns.hpBar.progress = (currPlayerDownsync.Hp * 1.0) / currPlayerDownsync.MaxHp;
     }
 
     // Move all to infinitely far away first
@@ -1268,24 +1384,6 @@ othersForcedDownsyncRenderFrame=${JSON.stringify(othersForcedDownsyncRenderFrame
       }
       const j = gopkgs.ConvertToDelayedInputFrameId(i);
       const delayedInputFrame = self.recentInputCache.GetByFrameId(j);
-      /*
-      const prevJ = gopkgs.ConvertToDelayedInputFrameId(i - 1);
-      const prevDelayedInputFrame = self.recentInputCache.GetByFrameId(prevJ);
-      const prevBtnALevel = (null == prevDelayedInputFrame ? 0 : ((prevDelayedInputFrame.InputList[self.selfPlayerInfo.JoinIndex - 1] >> 4) & 1));
-      const btnALevel = ((delayedInputFrame.InputList[self.selfPlayerInfo.JoinIndex - 1] >> 4) & 1);
-      if (
-          ATK_CHARACTER_STATE.Atk1[0] == currRdf.PlayersArr[self.selfPlayerInfo.JoinIndex - 1].CharacterState
-          ||
-          ATK_CHARACTER_STATE.Atk2[0] == currRdf.PlayersArr[self.selfPlayerInfo.JoinIndex - 1].CharacterState
-        ) {
-          console.log(`rdf.Id=${i}, (btnALevel,j)=(${btnALevel},${j}), (prevBtnALevel,prevJ) is (${prevBtnALevel},${prevJ}), in cancellable atk!`);
-      } 
-      if (btnALevel > 0) {
-        if (btnALevel > prevBtnALevel) {
-          console.log(`rdf.Id=${i}, rising edge of btnA triggered`);
-        }
-      }  
-      */
 
       if (self.frameDataLoggingEnabled) {
         const actuallyUsedInputClone = delayedInputFrame.InputList.slice();
@@ -1331,7 +1429,7 @@ othersForcedDownsyncRenderFrame=${JSON.stringify(othersForcedDownsyncRenderFrame
 
       const selfPlayerId = self.selfPlayerInfo.Id;
       if (selfPlayerId == playerId) {
-        self.selfPlayerInfo.JoinIndex = immediatePlayerInfo.JoinIndex;
+        self.selfPlayerInfo.JoinIndex = immediatePlayerInfo.JoinIndex; // Update here in case of any change during WAITING phase
         nodeAndScriptIns[1].showArrowTipNode();
       }
     }
@@ -1408,6 +1506,21 @@ othersForcedDownsyncRenderFrame=${JSON.stringify(othersForcedDownsyncRenderFrame
     return s.join(',');
   },
 
+  gopkgsInputFrameDownsyncStr(inputFrameDownsync) {
+    if (null == inputFrameDownsync) return "{}";
+    const self = this;
+    let s = [];
+    s.push(`InputFrameId:${inputFrameDownsync.InputFrameId}`);
+    let ss = [];
+    for (let k = 0; k < window.boundRoomCapacity; ++k) {
+      ss.push(`"${inputFrameDownsync.InputList[k]}"`);
+    }
+    s.push(`InputList:[${ss.join(',')}]`);
+    s.push(`ConfirmedList:${inputFrameDownsync.ConfirmedList}`);
+
+    return `{${s.join(',')}}`;
+  },
+
   _stringifyRdfIdToActuallyUsedInput() {
     const self = this;
     let s = [];

frontend/assets/scripts/NetworkDoctor.js

@@ -14,7 +14,7 @@ NetworkDoctor.prototype.reset = function(capacity) {
 
   this.inputRateThreshold = gopkgs.ConvertToNoDelayInputFrameId(60);
   this.peerUpsyncThreshold = 8;
-  this.rollbackFramesThreshold = 4; // Slightly smaller than the minimum "TurnAroundFramesToRecover".
+  this.rollbackFramesThreshold = 8; // Roughly the minimum "TurnAroundFramesToRecover".
 };
 
 NetworkDoctor.prototype.logSending = function(stFrameId, edFrameId) {
@@ -79,13 +79,29 @@ NetworkDoctor.prototype.logSkippedRenderFrameCnt = function() {
   this.skippedRenderFrameCnt += 1;
 }
 
-NetworkDoctor.prototype.isTooFast = function() {
+NetworkDoctor.prototype.isTooFast = function(mapIns) {
   const [sendingFps, srvDownsyncFps, peerUpsyncFps, rollbackFrames, skippedRenderFrameCnt] = this.stats();
-  if (sendingFps >= this.inputRateThreshold && srvDownsyncFps >= this.inputRateThreshold) {
-    // At least my network is OK for both TX & RX directions. 
-    if (rollbackFrames >= this.rollbackFramesThreshold) {
-      // I got many frames rolled back while none of my peers effectively helped my preciction. Deliberately not using "peerUpsyncThreshold" here because when using UDP p2p upsync broadcasting, we expect to receive effective p2p upsyncs from every other player.   
-      return true;
+  if (sendingFps >= this.inputRateThreshold + 3) {
+    // Don't send too fast
+    console.log(`Sending too fast, sendingFps=${sendingFps}`);
+    return true;
+  } else {
+    const sendingFpsNormal = (sendingFps >= this.inputRateThreshold);
+    // An outstanding lag within the "inputFrameDownsyncQ" will reduce "srvDownsyncFps", HOWEVER, a constant lag wouldn't impact "srvDownsyncFps"! In native platforms we might use PING value might help as a supplement information to confirm that the "selfPlayer" is not lagged within the time accounted by "inputFrameDownsyncQ".  
+    const recvFpsNormal = (srvDownsyncFps >= this.inputRateThreshold || peerUpsyncFps >= this.inputRateThreshold * (window.boundRoomCapacity - 1));
+    if (sendingFpsNormal && recvFpsNormal) {
+      let selfInputFrameIdFront = gopkgs.ConvertToNoDelayInputFrameId(mapIns.renderFrameId);
+      let minInputFrameIdFront = Number.MAX_VALUE;
+      for (let k = 0; k < window.boundRoomCapacity; ++k) {
+        if (k + 1 == mapIns.selfPlayerInfo.JoinIndex) continue;
+        if (mapIns.lastIndividuallyConfirmedInputFrameId[k] >= minInputFrameIdFront) continue;
+        minInputFrameIdFront = mapIns.lastIndividuallyConfirmedInputFrameId[k];
+      }
+      if ((selfInputFrameIdFront > minInputFrameIdFront) && ((selfInputFrameIdFront - minInputFrameIdFront) > (mapIns.inputFrameUpsyncDelayTolerance + 1))) {
+        // first comparison condition is to avoid numeric overflow
+        console.log(`Game logic ticking too fast, selfInputFrameIdFront=${selfInputFrameIdFront}, minInputFrameIdFront=${minInputFrameIdFront}, inputFrameUpsyncDelayTolerance=${mapIns.inputFrameUpsyncDelayTolerance}`);
+        return true;
+      }
     }
   }
   return false;

frontend/assets/scripts/OfflineMap.js

@@ -98,7 +98,7 @@ cc.Class({
       const p2Vpos = gopkgs.WorldToVirtualGridPos(boundaryObjs.playerStartingPositions[1].x, boundaryObjs.playerStartingPositions[1].y);
       const colliderRadiusV = gopkgs.WorldToVirtualGridPos(12.0, 0);
 
-      const speciesIdList = [1, 4096];
+      const speciesIdList = [4096, 0];
       const chConfigsOrderedByJoinIndex = gopkgs.GetCharacterConfigsOrderedByJoinIndex(speciesIdList);
 
       const startRdf = window.pb.protos.RoomDownsyncFrame.create({
@@ -109,6 +109,8 @@ cc.Class({
             joinIndex: 1,
             virtualGridX: p1Vpos[0],
             virtualGridY: p1Vpos[1],
+            revivalVirtualGridX: p1Vpos[0],
+            revivalVirtualGridY: p1Vpos[1],
             speed: chConfigsOrderedByJoinIndex[0].Speed,
             colliderRadius: colliderRadiusV[0],
             characterState: window.ATK_CHARACTER_STATE.InAirIdle1NoJump[0],
@@ -119,12 +121,16 @@ cc.Class({
             velY: 0,
             inAir: true,
             onWall: false,
+            hp: 100,
+            maxHp: 100,
           }),
           window.pb.protos.PlayerDownsync.create({
             id: 11,
             joinIndex: 2,
             virtualGridX: p2Vpos[0],
             virtualGridY: p2Vpos[1],
+            revivalVirtualGridX: p2Vpos[0],
+            revivalVirtualGridY: p2Vpos[1],
             speed: chConfigsOrderedByJoinIndex[1].Speed,
             colliderRadius: colliderRadiusV[0],
             characterState: window.ATK_CHARACTER_STATE.InAirIdle1NoJump[0],
@@ -135,6 +141,8 @@ cc.Class({
             velY: 0,
             inAir: true,
             onWall: false,
+            hp: 100,
+            maxHp: 100,
           }),
         ],
         speciesIdList: speciesIdList,
@@ -144,6 +152,35 @@ cc.Class({
         Id: 10,
         JoinIndex: 1,
       };
+      if (cc.sys.isNative) {
+        window.onUdpMessage = (args) => {
+          const len = args.length;
+          const ui8Arr = new Uint8Array(len);
+          for (let i = 0; i < len; i++) {
+            ui8Arr[i] = args.charCodeAt(i);
+          }
+          cc.log(`#1 Js called back by CPP: onUdpMessage: args=${args}, typeof(args)=${typeof (args)}, argslen=${args.length}, ui8Arr=${ui8Arr}`);
+          const echoed = window.pb.protos.HolePunchUpsync.decode(ui8Arr);
+          cc.log(`#2 Js called back by CPP: onUdpMessage: ${JSON.stringify(echoed)}`);
+        };
+        const res1 = DelayNoMore.UdpSession.openUdpSession(8888 + self.selfPlayerInfo.JoinIndex);
+        const holePunchData = window.pb.protos.HolePunchUpsync.encode({
+          boundRoomId: 22,
+          intAuthToken: "foobar",
+          authKey: Math.floor(Math.random() * 65535),
+        }).finish()
+        //const res2 = DelayNoMore.UdpSession.punchToServer("127.0.0.1", 3000, holePunchData, 19999, holePunchData);
+        const res3 = DelayNoMore.UdpSession.upsertPeerUdpAddr([window.pb.protos.PeerUdpAddr.create({
+          ip: "192.168.31.194",
+          port: 6789,
+          authKey: 123456,
+        }), window.pb.protos.PeerUdpAddr.create({
+          ip: "192.168.1.101",
+          port: 8771,
+          authKey: 654321,
+        })], 2, self.selfPlayerInfo.JoinIndex);
+      //const res4 = DelayNoMore.UdpSession.closeUdpSession();
+      }
       self.onRoomDownsyncFrame(startRdf);
 
       self.battleState = ALL_BATTLE_STATES.IN_BATTLE;
@@ -154,19 +191,13 @@ cc.Class({
   update(dt) {
     const self = this;
     if (ALL_BATTLE_STATES.IN_BATTLE == self.battleState) {
-      const elapsedMillisSinceLastFrameIdTriggered = performance.now() - self.lastRenderFrameIdTriggeredAt;
-      if (elapsedMillisSinceLastFrameIdTriggered < self.tooFastDtIntervalMillis) {
-        // [WARNING] We should avoid a frontend ticking too fast to prevent cheating, as well as ticking too slow to cause a "resync avalanche" that impacts user experience!
-        // console.debug("Avoiding too fast frame@renderFrameId=", self.renderFrameId, ": elapsedMillisSinceLastFrameIdTriggered=", elapsedMillisSinceLastFrameIdTriggered);
-        //return;
-      }
       try {
         let st = performance.now();
         let prevSelfInput = null,
           currSelfInput = null;
         const noDelayInputFrameId = gopkgs.ConvertToNoDelayInputFrameId(self.renderFrameId); // It's important that "inputDelayFrames == 0" here 
         if (gopkgs.ShouldGenerateInputFrameUpsync(self.renderFrameId)) {
-          const prevAndCurrInputs = self.getOrPrefabInputFrameUpsync(noDelayInputFrameId);
+          const prevAndCurrInputs = self.getOrPrefabInputFrameUpsync(noDelayInputFrameId, true);
           prevSelfInput = prevAndCurrInputs[0];
           currSelfInput = prevAndCurrInputs[1];
         }

frontend/assets/scripts/WsSessionMgr.js

@@ -12,6 +12,7 @@ window.DOWNSYNC_MSG_ACT_INPUT_BATCH = 2;
 window.DOWNSYNC_MSG_ACT_BATTLE_STOPPED = 3;
 window.DOWNSYNC_MSG_ACT_FORCED_RESYNC = 4;
 window.DOWNSYNC_MSG_ACT_PEER_INPUT_BATCH = 5;
+window.DOWNSYNC_MSG_ACT_PEER_UDP_ADDR = 6;
 
 window.sendSafely = function(msgStr) {
   /**
@@ -33,7 +34,7 @@ window.closeWSConnection = function(code, reason) {
     console.log(`"window.clientSession" is already closed or destroyed.`);
     return;
   }
-  console.log(`Closing "window.clientSession" from the client-side.`);
+  console.log(`Closing "window.clientSession" from the client-side with code=${code}.`);
   window.clientSession.close(code, reason);
 }
 
@@ -43,12 +44,24 @@ window.getBoundRoomIdFromPersistentStorage = function() {
     window.clearBoundRoomIdInBothVolatileAndPersistentStorage();
     return null;
   }
-  return cc.sys.localStorage.getItem("boundRoomId");
+  const boundRoomIdStr = cc.sys.localStorage.getItem("boundRoomId");
+  return (null == boundRoomIdStr ? null : parseInt(boundRoomIdStr));
+};
+
+window.getBoundRoomCapacityFromPersistentStorage = function() {
+  const boundRoomIdExpiresAt = parseInt(cc.sys.localStorage.getItem("boundRoomIdExpiresAt"));
+  if (!boundRoomIdExpiresAt || Date.now() >= boundRoomIdExpiresAt) {
+    window.clearBoundRoomIdInBothVolatileAndPersistentStorage();
+    return null;
+  }
+  const boundRoomCapacityStr = cc.sys.localStorage.getItem("boundRoomCapacity");
+  return (null == boundRoomCapacityStr ? null : parseInt(boundRoomCapacityStr));
 };
 
 window.clearBoundRoomIdInBothVolatileAndPersistentStorage = function() {
   window.boundRoomId = null;
   cc.sys.localStorage.removeItem("boundRoomId");
+  cc.sys.localStorage.removeItem("boundRoomCapacity");
   cc.sys.localStorage.removeItem("boundRoomIdExpiresAt");
 };
 
@@ -57,18 +70,51 @@ window.clearSelfPlayer = function() {
 };
 
 window.boundRoomId = getBoundRoomIdFromPersistentStorage();
+window.boundRoomCapacity = getBoundRoomCapacityFromPersistentStorage();
 window.handleHbRequirements = function(resp) {
+  console.log(`Handle hb requirements #1`);
   if (constants.RET_CODE.OK != resp.ret) return;
-  if (null == window.boundRoomId) {
+  // The assignment of "window.mapIns" is inside "Map.onLoad", which precedes "initPersistentSessionClient".
+  window.mapIns.selfPlayerInfo = JSON.parse(cc.sys.localStorage.getItem('selfPlayer')); // This field is kept for distinguishing "self" and "others".
+  window.mapIns.selfPlayerInfo.Id = window.mapIns.selfPlayerInfo.playerId;
+  window.mapIns.selfPlayerInfo.JoinIndex = resp.peerJoinIndex;
+  console.log(`Handle hb requirements #2`);
+  if (null == window.boundRoomId || null == window.boundRoomCapacity) {
     window.boundRoomId = resp.bciFrame.boundRoomId;
+    window.boundRoomCapacity = resp.bciFrame.boundRoomCapacity;
     cc.sys.localStorage.setItem('boundRoomId', window.boundRoomId);
+    cc.sys.localStorage.setItem('boundRoomCapacity', window.boundRoomCapacity);
     cc.sys.localStorage.setItem('boundRoomIdExpiresAt', Date.now() + 10 * 60 * 1000); // Temporarily hardcoded, for `boundRoomId` only.
   }
-
+  console.log(`Handle hb requirements #3`);
   if (window.handleBattleColliderInfo) {
-    window.initSecondarySession(null, window.boundRoomId);
     window.handleBattleColliderInfo(resp.bciFrame);
   }
+  console.log(`Handle hb requirements #4`);
+
+  if (!cc.sys.isNative) {
+    console.log(`Handle hb requirements #5, web`);
+    window.initSecondarySession(null, window.boundRoomId);
+  } else {
+    console.log(`Handle hb requirements #5, native, bciFrame.battleUdpTunnel=${resp.bciFrame.battleUdpTunnel}, selfPlayerInfo=${JSON.stringify(window.mapIns.selfPlayerInfo)}`);
+    const res1 = DelayNoMore.UdpSession.openUdpSession(8888 + window.mapIns.selfPlayerInfo.JoinIndex);
+    window.mapIns.selfPlayerInfo.udpTunnelAuthKey = resp.bciFrame.battleUdpTunnel.authKey;
+    const intAuthToken = window.mapIns.selfPlayerInfo.intAuthToken;
+    const authKey = Math.floor(Math.random() * 65535);
+    window.mapIns.selfPlayerInfo.authKey = authKey;
+    const holePunchData = window.pb.protos.HolePunchUpsync.encode({
+      boundRoomId: window.boundRoomId,
+      intAuthToken: intAuthToken,
+      authKey: authKey,
+    }).finish();
+    const udpTunnelHolePunchData = window.pb.protos.WsReq.encode({
+      msgId: Date.now(),
+      playerId: window.mapIns.selfPlayerInfo.Id,
+      act: window.UPSYNC_MSG_ACT_PLAYER_CMD,
+      authKey: resp.bciFrame.battleUdpTunnel.authKey,
+    }).finish();
+    const res2 = DelayNoMore.UdpSession.punchToServer(backendAddress.HOST, 3000, holePunchData, resp.bciFrame.battleUdpTunnel.port, udpTunnelHolePunchData);
+  }
 };
 
 function _uint8ToBase64(uint8Arr) {
@@ -126,6 +172,7 @@ window.initPersistentSessionClient = function(onopenCb, expectedRoomId) {
     urlToConnect = urlToConnect + "&expectedRoomId=" + expectedRoomId;
   } else {
     window.boundRoomId = getBoundRoomIdFromPersistentStorage();
+    window.boundRoomCapacity = getBoundRoomCapacityFromPersistentStorage();
     if (null != window.boundRoomId) {
       console.log("initPersistentSessionClient with boundRoomId == " + boundRoomId);
       urlToConnect = urlToConnect + "&boundRoomId=" + window.boundRoomId;
@@ -176,6 +223,19 @@ window.initPersistentSessionClient = function(onopenCb, expectedRoomId) {
           }
           mapIns.onRoomDownsyncFrame(resp.rdf, resp.inputFrameDownsyncBatch);
           break;
+        case window.DOWNSYNC_MSG_ACT_PEER_UDP_ADDR:
+          console.warn(`Got DOWNSYNC_MSG_ACT_PEER_UDP_ADDR resp=${JSON.stringify(resp, null, 2)}`);
+          if (cc.sys.isNative) {
+            const peerJoinIndex = resp.peerJoinIndex;
+            const peerAddrList = resp.rdf.peerUdpAddrList;
+            console.log(`Got DOWNSYNC_MSG_ACT_PEER_UDP_ADDR peerAddrList=${JSON.stringify(peerAddrList)}; boundRoomCapacity=${window.boundRoomCapacity}`);
+            for (let j = 0; j < 3; ++j) {
+                setTimeout(()=> {
+                    DelayNoMore.UdpSession.upsertPeerUdpAddr(peerAddrList, window.boundRoomCapacity, window.mapIns.selfPlayerInfo.JoinIndex); // In C++ impl it actually broadcasts the peer-punching message to all known peers within "window.boundRoomCapacity"
+                }, j*500);
+            }
+          }
+          break;
         default:
           break;
       }
@@ -192,13 +252,21 @@ window.initPersistentSessionClient = function(onopenCb, expectedRoomId) {
   clientSession.onclose = function(evt) {
     // [WARNING] The callback "onclose" might be called AFTER the webpage is refreshed with "1001 == evt.code".
     console.warn(`The WS clientSession is closed: evt=${JSON.stringify(evt)}, evt.code=${evt.code}`);
+    if (cc.sys.isNative) {
+      if (mapIns.frameDataLoggingEnabled) {
+        console.warn(`${mapIns._stringifyRdfIdToActuallyUsedInput()}
+`);
+      }
+      DelayNoMore.UdpSession.closeUdpSession();
+    }
     switch (evt.code) {
       case constants.RET_CODE.CLIENT_MISMATCHED_RENDER_FRAME:
         break;
       case constants.RET_CODE.BATTLE_STOPPED:
         // deliberately do nothing
         if (mapIns.frameDataLoggingEnabled) {
-          console.warn(`${mapIns._stringifyRdfIdToActuallyUsedInput()}`);
+          console.warn(`${mapIns._stringifyRdfIdToActuallyUsedInput()}
+`);
         }
         break;
       case constants.RET_CODE.PLAYER_NOT_ADDABLE_TO_ROOM:
@@ -213,9 +281,10 @@ window.initPersistentSessionClient = function(onopenCb, expectedRoomId) {
       case constants.RET_CODE.MYSQL_ERROR:
       case constants.RET_CODE.PLAYER_NOT_FOUND:
       case constants.RET_CODE.PLAYER_CHEATING:
-      case 1006: // Peer(i.e. the backend) gone unexpectedly 
+      case 1006: // Peer(i.e. the backend) gone unexpectedly, but not working for "cc.sys.isNative" 
         if (mapIns.frameDataLoggingEnabled) {
-          console.warn(`${mapIns._stringifyRdfIdToActuallyUsedInput()}`);
+          console.warn(`${mapIns._stringifyRdfIdToActuallyUsedInput()}
+`);
         }
         window.clearLocalStorageAndBackToLoginScene(true);
         break;
@@ -227,16 +296,15 @@ window.initPersistentSessionClient = function(onopenCb, expectedRoomId) {
 
 window.clearLocalStorageAndBackToLoginScene = function(shouldRetainBoundRoomIdInBothVolatileAndPersistentStorage) {
   console.warn("+++++++ Calling `clearLocalStorageAndBackToLoginScene`");
+  window.clearSelfPlayer();
+  if (true != shouldRetainBoundRoomIdInBothVolatileAndPersistentStorage) {
+    window.clearBoundRoomIdInBothVolatileAndPersistentStorage();
+  }
 
   if (window.mapIns && window.mapIns.musicEffectManagerScriptIns) {
     window.mapIns.musicEffectManagerScriptIns.stopAllMusic();
   }
 
-  window.closeWSConnection();
-  window.clearSelfPlayer();
-  if (true != shouldRetainBoundRoomIdInBothVolatileAndPersistentStorage) {
-    window.clearBoundRoomIdInBothVolatileAndPersistentStorage();
-  }
   cc.director.loadScene('login');
 };
 
@@ -274,7 +342,7 @@ window.initSecondarySession = function(onopenCb, boundRoomId) {
       //console.log(`Got non-empty onmessage decoded: resp.act=${resp.act}`);
       switch (resp.act) {
         case window.DOWNSYNC_MSG_ACT_PEER_INPUT_BATCH:
-          mapIns.onPeerInputFrameUpsync(resp.peerJoinIndex, resp.inputFrameDownsyncBatch);
+          mapIns.onPeerInputFrameUpsync(resp.peerJoinIndex, resp.inputFrameDownsyncBatch, false);
           break;
         default:
           break;

frontend/assets/scripts/modules/jsexport.js.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.5",
-  "uuid": "40edd08e-316c-44b8-a50f-bd173554c554",
+  "uuid": "171e2c96-28b4-4225-bdcc-5e464f07d91a",
   "isPlugin": true,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

frontend/build-templates/jsb-link/cocos-project-template.json

@@ -0,0 +1,81 @@
+{
+    "do_default": {
+        "exclude_from_template": [
+            "frameworks/runtime-src"
+        ]
+    },
+    "do_add_native_support": {
+        "append_from_template": {
+            "from": "frameworks/runtime-src",
+            "to": "frameworks/runtime-src",
+            "exclude": [
+                "proj.win32/Debug.win32",
+                "proj.win32/Release.win32",
+                "proj.win32/DelayNoMore.sdf"
+            ]
+        },
+        "append_file": [{
+            "from": "cocos/scripting/js-bindings/manual/jsb_module_register.cpp",
+            "to": "frameworks/runtime-src/Classes/jsb_module_register.cpp"
+        }, {
+            "from": "frameworks/runtime-src/Classes/send_ring_buff.hpp",
+            "to": "frameworks/runtime-src/Classes/send_ring_buff.hpp"
+        }, {
+            "from": "frameworks/runtime-src/Classes/send_ring_buff.cpp",
+            "to": "frameworks/runtime-src/Classes/send_ring_buff.cpp"
+        }, {
+            "from": "frameworks/runtime-src/Classes/udp_session.hpp",
+            "to": "frameworks/runtime-src/Classes/udp_session.hpp"
+        }, {
+            "from": "frameworks/runtime-src/Classes/udp_session.cpp",
+            "to": "frameworks/runtime-src/Classes/udp_session.cpp"
+        }, {
+            "from": "frameworks/runtime-src/Classes/udp_session_bridge.hpp",
+            "to": "frameworks/runtime-src/Classes/udp_session_bridge.hpp"
+        }, {
+            "from": "frameworks/runtime-src/Classes/udp_session_bridge.cpp",
+            "to": "frameworks/runtime-src/Classes/udp_session_bridge.cpp"
+        }],
+        "project_rename": {
+            "src_project_name": "DelayNoMore",
+            "files": [
+                "frameworks/runtime-src/proj.win32/PROJECT_NAME.vcxproj",
+                "frameworks/runtime-src/proj.win32/PROJECT_NAME.vcxproj.filters",
+                "frameworks/runtime-src/proj.win32/PROJECT_NAME.vcxproj.user",
+                "frameworks/runtime-src/proj.win32/PROJECT_NAME.sln"
+            ]
+        },
+        "project_replace_project_name": {
+            "src_project_name": "DelayNoMore",
+            "files": [
+                "frameworks/runtime-src/proj.win32/PROJECT_NAME.vcxproj",
+                "frameworks/runtime-src/proj.win32/PROJECT_NAME.vcxproj.filters",
+                "frameworks/runtime-src/proj.win32/PROJECT_NAME.vcxproj.user",
+                "frameworks/runtime-src/proj.win32/PROJECT_NAME.sln",
+                "frameworks/runtime-src/proj.win32/main.cpp",
+                "frameworks/runtime-src/proj.android-studio/settings.gradle",
+                "frameworks/runtime-src/proj.android-studio/app/res/values/strings.xml",
+                "frameworks/runtime-src/Classes/AppDelegate.cpp"
+            ]
+        },
+        "project_replace_package_name": {
+            "src_package_name": "org.genxium.delaynomore",
+            "files": [
+                "frameworks/runtime-src/proj.android-studio/app/build.gradle",
+                "frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml"
+            ]
+        },
+        "project_replace_mac_bundleid": {
+            "src_bundle_id": "org.genxium.delaynomore",
+            "files": [
+                "frameworks/runtime-src/proj.ios_mac/mac/Info.plist"
+            ]
+        },
+        "project_replace_ios_bundleid": {
+            "src_bundle_id": "org.genxium.delaynomore",
+            "files": [
+                "frameworks/runtime-src/proj.ios_mac/ios/Info.plist"
+            ]
+        }
+    }
+}

frontend/build-templates/jsb-link/frameworks/runtime-src/Classes/AppDelegate.cpp

@@ -0,0 +1,93 @@
+/****************************************************************************
+ Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+ 
+ http://www.cocos.com
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated engine source code (the "Software"), a limited,
+ worldwide, royalty-free, non-assignable, revocable and non-exclusive license
+ to use Cocos Creator solely to develop games on your target platforms. You shall
+ not use Cocos Creator software for developing other software or tools that's
+ used for developing games. You are not granted to publish, distribute,
+ sublicense, and/or sell copies of Cocos Creator.
+ 
+ The software or tools in this License Agreement are licensed, not sold.
+ Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+#include "AppDelegate.h"
+
+#include "cocos2d.h"
+
+//#include "cocos/audio/include/AudioEngine.h"
+#include "cocos/scripting/js-bindings/manual/jsb_module_register.hpp"
+#include "cocos/scripting/js-bindings/manual/jsb_global.h"
+#include "cocos/scripting/js-bindings/jswrapper/SeApi.h"
+#include "cocos/scripting/js-bindings/event/EventDispatcher.h"
+#include "cocos/scripting/js-bindings/manual/jsb_classtype.hpp"
+#include "udp_session_bridge.hpp"
+USING_NS_CC;
+
+AppDelegate::AppDelegate(int width, int height) : Application("Cocos Game", width, height)
+{
+}
+
+AppDelegate::~AppDelegate()
+{
+}
+
+bool AppDelegate::applicationDidFinishLaunching()
+{
+    se::ScriptEngine *se = se::ScriptEngine::getInstance();
+    
+    jsb_set_xxtea_key("");
+    jsb_init_file_operation_delegate();
+    
+#if defined(COCOS2D_DEBUG) && (COCOS2D_DEBUG > 0)
+    // Enable debugger here
+    jsb_enable_debugger("0.0.0.0", 6086, false);
+#endif
+    
+    se->setExceptionCallback([](const char *location, const char *message, const char *stack) {
+        // Send exception information to server like Tencent Bugly.
+    });
+    
+    jsb_register_all_modules();
+    se->addRegisterCallback(registerUdpSession);
+    
+    se->start();
+    
+    se::AutoHandleScope hs;
+    jsb_run_script("jsb-adapter/jsb-builtin.js");
+    jsb_run_script("main.js");
+    
+    se->addAfterCleanupHook([]() {
+        JSBClassType::destroy();
+    });
+    
+    return true;
+}
+
+// This function will be called when the app is inactive. When comes a phone call,it's be invoked too
+void AppDelegate::applicationDidEnterBackground()
+{
+    EventDispatcher::dispatchEnterBackgroundEvent();
+    // Ensure that handle AudioEngine enter background after all enter background events are handled
+    //AudioEngine::onEnterBackground();
+}
+
+// this function will be called when the app is active again
+void AppDelegate::applicationWillEnterForeground()
+{
+    // Ensure that handle AudioEngine enter foreground before all enter foreground events are handled
+    //AudioEngine::onEnterForeground();
+    EventDispatcher::dispatchEnterForegroundEvent();
+}

frontend/build-templates/jsb-link/frameworks/runtime-src/Classes/send_ring_buff.cpp

@@ -0,0 +1,31 @@
+#include <string.h>
+#include "send_ring_buff.hpp"
+
+void SendRingBuff::put(BYTEC* const newBytes, size_t newBytesLen, PeerAddr* pNewPeerAddr) {
+    while (0 < cnt && cnt >= n) {
+        // Make room for the new element
+        this->pop();
+    }
+    eles[ed].bytesLen = newBytesLen;
+    memset(eles[ed].bytes, 0, sizeof eles[ed].bytes);
+    memcpy(eles[ed].bytes, newBytes, newBytesLen);
+    eles[ed].peerAddr = *(pNewPeerAddr);
+    ed++;
+    cnt++;
+    if (ed >= n) {
+        ed -= n; // Deliberately not using "%" operator for performance concern
+    }
+}
+
+SendWork* SendRingBuff::pop() {
+    if (0 == cnt) {
+        return NULL;
+    }
+    SendWork* ret = &(eles[st]);
+    cnt--;
+    st++;
+    if (st >= n) {
+        st -= n;
+    }
+    return ret;
+}

frontend/build-templates/jsb-link/frameworks/runtime-src/Classes/send_ring_buff.hpp

@@ -0,0 +1,44 @@
+#ifndef send_ring_buff_hpp
+#define send_ring_buff_hpp
+
+#include "uv/uv.h"
+#define __SSIZE_T // Otherwise "ssize_t" would have conflicting macros error that stops compiling
+
+int const RING_BUFF_CONSECUTIVE_SET = 0;
+int const RING_BUFF_NON_CONSECUTIVE_SET = 1;
+int const RING_BUFF_FAILED_TO_SET = 2;
+
+typedef char BYTEC;
+typedef char const CHARC;
+int const maxUdpPayloadBytes = 128;
+int const maxBuffedMsgs = 512;
+
+struct PeerAddr {
+	struct sockaddr_in sockAddrIn;
+	uint32_t authKey;
+};
+
+class SendWork {
+public:
+	BYTEC bytes[maxUdpPayloadBytes]; // Wasting some RAM here thus no need for explicit recursive destruction
+	size_t bytesLen;
+	PeerAddr peerAddr;
+};
+
+// [WARNING] This class is specific to "SendWork", designed and implemented only to use in multithreading env and save heap alloc/dealloc timecomplexity, it's by no means comparable to the Golang or JavaScript versions!
+class SendRingBuff {
+public:
+	int ed, st, n, cnt;
+	SendWork eles[maxBuffedMsgs]; // preallocated on stack to save heap alloc/dealloc time
+	SendRingBuff(int newN) {
+		this->n = newN;
+		this->st = this->ed = this->cnt = 0;
+	}
+
+	void put(BYTEC* const newBytes, size_t newBytesLen, PeerAddr* pNewPeerAddr); 
+
+	// Sending is always sequential in UvSendThread, no need to return a copy of "SendWork" instance
+	SendWork* pop();
+};
+
+#endif

frontend/build-templates/jsb-link/frameworks/runtime-src/Classes/udp_session.cpp

@@ -0,0 +1,343 @@
+#include "udp_session.hpp"
+#include "base/ccMacros.h"
+#include "cocos/platform/CCApplication.h"
+#include "cocos/base/CCScheduler.h"
+#include "cocos/scripting/js-bindings/jswrapper/SeApi.h"
+
+int const punchServerCnt = 3;
+int const punchPeerCnt = 3;
+int const broadcastUpsyncCnt = 2;
+
+uv_udp_t *udpRecvSocket = NULL, *udpSendSocket = NULL;
+uv_thread_t recvTid, sendTid;
+uv_async_t uvRecvLoopStopSig, uvSendLoopStopSig, uvSendLoopTriggerSig;
+uv_loop_t *recvLoop = NULL, *sendLoop = NULL;
+
+uv_mutex_t sendRingBuffLock; // used along with "uvSendLoopTriggerSig" as a "uv_cond_t"
+SendRingBuff* sendRingBuff = NULL;
+
+char SRV_IP[256];
+int SRV_PORT = 0;
+int UDP_TUNNEL_SRV_PORT = 0;
+struct PeerAddr udpPunchingServerAddr, udpTunnelAddr;
+struct PeerAddr peerAddrList[maxPeerCnt];
+
+void _onRead(uv_udp_t* req, ssize_t nread, uv_buf_t const* buf, struct sockaddr const* addr, unsigned flags) {
+    if (nread < 0) {
+        CCLOGERROR("Read error %s", uv_err_name(nread));
+        uv_close((uv_handle_t*)req, NULL);
+        free(buf->base);
+        return;
+    }
+#if defined(COCOS2D_DEBUG) && (COCOS2D_DEBUG > 0)
+    char ip[INET_ADDRSTRLEN];
+    memset(ip, 0, sizeof ip);
+    int port = 0; 
+
+    if (NULL != addr) {
+        // The null check for "addr" is necessary, on Android there'd be such mysterious call to "_onRead"!
+        switch (addr->sa_family) {
+        case AF_INET: {
+            struct sockaddr_in const* sockAddr = (struct sockaddr_in const*)addr;
+            uv_inet_ntop(sockAddr->sin_family, &(sockAddr->sin_addr), ip, INET_ADDRSTRLEN);
+            port = ntohs(sockAddr->sin_port);
+            CCLOG("UDP received %u bytes from %s:%d", nread, ip, port);
+            break;
+        }
+        default:
+            break;
+        }
+    } else {
+        CCLOG("UDP received %u bytes from unknown sender", nread);
+    }
+#endif
+    
+    if (6 == nread) {
+        // holepunching
+    } else if (0 < nread) {
+        // Non-holepunching; it might be more effective in RAM usage to use a threadsafe RingBuff to pass msg to GameThread here, but as long as it's not a performance blocker don't bother optimize here...
+        uint8_t* const ui8Arr = (uint8_t*)malloc(maxUdpPayloadBytes*sizeof(uint8_t));
+        memset(ui8Arr, 0, sizeof(ui8Arr));
+        for (int i = 0; i < nread; i++) {
+            *(ui8Arr+i) = *(buf->base + i);
+        }
+        cocos2d::Application::getInstance()->getScheduler()->performFunctionInCocosThread([=]() {
+            // [WARNING] Use of the "ScriptEngine" is only allowed in "GameThread a.k.a. CocosThread"!
+            se::Value onUdpMessageCb;
+            se::ScriptEngine::getInstance()->getGlobalObject()->getProperty("onUdpMessage", &onUdpMessageCb);
+            // [WARNING] Declaring "AutoHandleScope" is critical here, otherwise "onUdpMessageCb.toObject()" wouldn't be recognized as a function of the ScriptEngine!
+            se::AutoHandleScope hs;
+            //CCLOG("UDP received %d bytes upsync -- 1", nread);
+            se::Object* const gameThreadMsg = se::Object::createTypedArray(se::Object::TypedArrayType::UINT8, ui8Arr, nread);
+            //CCLOG("UDP received %d bytes upsync -- 2", nread);
+            se::ValueArray args = { se::Value(gameThreadMsg) };
+            if (onUdpMessageCb.isObject() && onUdpMessageCb.toObject()->isFunction()) {
+                // Temporarily assume that the "this" ptr within callback is NULL.
+                bool ok = onUdpMessageCb.toObject()->call(args, NULL);
+                if (!ok) {
+                    se::ScriptEngine::getInstance()->clearException();
+                }
+            }
+            //CCLOG("UDP received %d bytes upsync -- 3", nread);
+            gameThreadMsg->decRef(); // Reference http://docs.cocos.com/creator/2.2/manual/en/advanced-topics/JSB2.0-learning.html#seobject
+            //CCLOG("UDP received %d bytes upsync -- 4", nread);
+            free(ui8Arr);
+            //CCLOG("UDP received %d bytes upsync -- 5", nread);
+        });
+    }
+    free(buf->base);
+
+    /*
+    // [WARNING] Don't call either of the following statements! They will make "_onRead" no longer called for incoming packets!
+    //uv_udp_recv_stop(req);
+    //uv_close((uv_handle_t*)req, NULL);
+    */
+}
+
+static void _allocBuffer(uv_handle_t* handle, size_t suggested_size, uv_buf_t* buf) {
+    (void)handle;
+    buf->base = (char*)malloc(suggested_size);
+    buf->len = suggested_size;
+}
+
+void _onUvStopSig(uv_async_t* handle) {
+    if (!handle) return;
+    uv_stop(handle->loop);
+    CCLOG("UDP loop %p is signaled to stop in UvXxxxThread", handle->loop);
+}
+
+void _afterSend(uv_udp_send_t* req, int status) {
+    if (req) {
+        free(req);
+    }
+    if (status) {
+        CCLOGERROR("uv_udp_send_cb error: %s\n", uv_strerror(status));
+    }
+}
+
+void _onUvSthNewToSend(uv_async_t* handle) {
+    
+    bool hasNext = true;
+    while (NULL != handle && true == hasNext) {
+        SendWork* work = NULL;
+        uv_mutex_lock(&sendRingBuffLock);
+        work = sendRingBuff->pop();
+                        
+        if (NULL == work) {
+            hasNext = false;
+        }
+        /*
+        [WARNING] The following "uv_udp_try_send" might block I / O for a long time, hence unlock "as soon as possible" to avoid blocking the "GameThread" which is awaiting to acquire this mutex!
+            
+        There's a very small chance where "sendRingBuff->put(...)" could contaminate the just popped "work" in "sendRingBuff->eles", thus "sendRingBuff->n" is made quite large to avoid that, moreover in terms of protecting "work" we're also unlocking "as late as possible"!
+        */
+        uv_mutex_unlock(&sendRingBuffLock);
+        if (NULL != work) {
+            
+            // [WARNING] If "uv_udp_send" is to be used instead of "uv_udp_try_send", as UvSendThread will always be terminated from GameThread, it's a MUST to use the following heap-alloc form to initialize "uv_udp_send_t* req" such that "_afterSend" is guaranteed to be called, otherwise "int uvRunRet2 = uv_run(l, UV_RUN_DEFAULT);" for UvSendThread would block forever due to residual active handles.
+
+            uv_udp_send_t* req = (uv_udp_send_t*)malloc(sizeof(uv_udp_send_t));
+            uv_buf_t sendBuffer = uv_buf_init(work->bytes, work->bytesLen);
+            uv_udp_send(req, udpSendSocket, &sendBuffer, 1, (struct sockaddr const*)&(work->peerAddr.sockAddrIn), _afterSend);
+            
+            //uv_buf_t sendBuffer = uv_buf_init(work->bytes, work->bytesLen);
+            //uv_udp_try_send(udpSendSocket, &sendBuffer, 1, (struct sockaddr const*)&(work->peerAddr.sockAddrIn));
+#if defined(COCOS2D_DEBUG) && (COCOS2D_DEBUG > 0)
+            char ip[INET_ADDRSTRLEN];
+            memset(ip, 0, sizeof ip);
+            uv_inet_ntop(work->peerAddr.sockAddrIn.sin_family, &(work->peerAddr.sockAddrIn.sin_addr), ip, INET_ADDRSTRLEN);
+            int port = ntohs(work->peerAddr.sockAddrIn.sin_port);
+            CCLOG("UDP sent %d bytes to %s:%d", sendBuffer.len, ip, port);
+#endif
+        }
+    }
+}
+
+void _onWalkCleanup(uv_handle_t* handle, void* data) {
+    (void)data;
+    uv_close(handle, NULL);
+}
+
+void startRecvLoop(void* arg) {
+    uv_loop_t* l = (uv_loop_t*)arg;
+    int uvRunRet1 = uv_run(l, UV_RUN_DEFAULT);
+    CCLOG("UDP recv loop is ended in UvRecvThread, uvRunRet1=%d", uvRunRet1);
+    uv_walk(l, _onWalkCleanup, NULL);
+    CCLOG("UDP recv loop is walked in UvRecvThread");
+    int uvRunRet2 = uv_run(l, UV_RUN_DEFAULT);
+    CCLOG("UDP recv loop is run after walking in UvRecvThread, uvRunRet2=%d", uvRunRet2);
+
+    int uvCloseRet = uv_loop_close(l);
+    CCLOG("UDP recv loop is closed in UvRecvThread, uvCloseRet=%d", uvCloseRet);
+}
+
+void startSendLoop(void* arg) {
+    uv_loop_t* l = (uv_loop_t*)arg;
+    int uvRunRet1 = uv_run(l, UV_RUN_DEFAULT);
+    CCLOG("UDP send loop is ended in UvSendThread, uvRunRet1=%d", uvRunRet1);
+    uv_walk(l, _onWalkCleanup, NULL);
+    CCLOG("UDP send loop is walked in UvSendThread");
+    int uvRunRet2 = uv_run(l, UV_RUN_DEFAULT);
+    CCLOG("UDP send loop is run after walking in UvSendThread, uvRunRet2=%d", uvRunRet2);
+
+    int uvCloseRet = uv_loop_close(l);
+    CCLOG("UDP send loop is closed in UvSendThread, uvCloseRet=%d", uvCloseRet);
+    uv_mutex_destroy(&sendRingBuffLock);
+}
+
+int initSendLoop(struct sockaddr const* pUdpAddr) {
+    sendLoop = uv_loop_new();
+    udpSendSocket = (uv_udp_t*)malloc(sizeof(uv_udp_t));
+    int sendSockInitRes = uv_udp_init(sendLoop, udpSendSocket); // "uv_udp_init" must precede that of "uv_udp_bind" for successful binding!
+    int sendBindRes = uv_udp_bind(udpSendSocket, pUdpAddr, UV_UDP_REUSEADDR);
+    if (0 != sendBindRes) {
+        CCLOGERROR("Failed to bind send; sendSockInitRes=%d, sendBindRes=%d, reason=%s", sendSockInitRes, sendBindRes, uv_strerror(sendBindRes));
+        exit(-1);
+    }
+    uv_mutex_init(&sendRingBuffLock);
+    sendRingBuff = new SendRingBuff(maxBuffedMsgs);
+    uv_async_init(sendLoop, &uvSendLoopStopSig, _onUvStopSig);
+    uv_async_init(sendLoop, &uvSendLoopTriggerSig, _onUvSthNewToSend);
+
+    return sendBindRes;
+}
+
+bool initRecvLoop(struct sockaddr const* pUdpAddr) {
+    recvLoop = uv_loop_new();
+    udpRecvSocket = (uv_udp_t*)malloc(sizeof(uv_udp_t));
+
+    int recvSockInitRes = uv_udp_init(recvLoop, udpRecvSocket);
+    int recvbindRes = uv_udp_bind(udpRecvSocket, pUdpAddr, UV_UDP_REUSEADDR);
+    if (0 != recvbindRes) {
+        CCLOGERROR("Failed to bind recv; recvSockInitRes=%d, recvbindRes=%d, reason=%s", recvSockInitRes, recvbindRes, uv_strerror(recvbindRes));
+        exit(-1);
+    }
+    uv_udp_recv_start(udpRecvSocket, _allocBuffer, _onRead);
+    uv_async_init(recvLoop, &uvRecvLoopStopSig, _onUvStopSig);
+
+    return recvbindRes;
+}
+
+bool DelayNoMore::UdpSession::openUdpSession(int port) {
+    struct sockaddr_in udpAddr;
+    uv_ip4_addr("0.0.0.0", port, &udpAddr);
+    struct sockaddr const* pUdpAddr = (struct sockaddr const*)&udpAddr;
+    /*
+    [WARNING] On Android, the libuv documentation of "UV_UDP_REUSEADDR" is true, i.e. only the socket that binds later on the same port will be triggered the recv callback; however on Windows, experiment shows that the exact reverse is true instead.
+
+    It's feasible to use a same socket instance for both receiving and sending in different threads, however not knowing the exact thread-safety concerns for "uv_udp_send/uv_udp_try_send" & "uv recv callback" stops me from doing so, I'd prefer to stick to using different socket instances in different threads. 
+    */
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+    initSendLoop(pUdpAddr);
+    initRecvLoop(pUdpAddr);
+#else
+    initRecvLoop(pUdpAddr);
+    initSendLoop(pUdpAddr);
+#endif
+    CCLOG("About to open UDP session at port=%d; recvLoop=%p, sendLoop=%p...", port, recvLoop, sendLoop);
+
+    uv_thread_create(&recvTid, startRecvLoop, recvLoop);
+    uv_thread_create(&sendTid, startSendLoop, sendLoop);
+
+    CCLOG("Finished opening UDP session at port=%d", port);
+
+    return true;
+}
+
+bool DelayNoMore::UdpSession::closeUdpSession() {
+    CCLOG("About to close udp session and dealloc all resources...");
+
+    uv_async_send(&uvSendLoopStopSig);
+    CCLOG("Signaling UvSendThread to end in GameThread...");
+    uv_thread_join(&sendTid);
+    free(udpSendSocket);
+    free(sendLoop);
+    delete sendRingBuff;
+
+    uv_async_send(&uvRecvLoopStopSig); // The few if not only guaranteed thread safe utility of libuv :) See http://docs.libuv.org/en/v1.x/async.html#c.uv_async_send
+    CCLOG("Signaling UvRecvThread to end in GameThread...");
+    uv_thread_join(&recvTid);
+    free(udpRecvSocket);
+    free(recvLoop);
+
+    for (int i = 0; i < maxPeerCnt; i++) {
+        peerAddrList[i].authKey = -1; // hardcoded for now
+        memset((char*)&peerAddrList[i].sockAddrIn, 0, sizeof(peerAddrList[i].sockAddrIn));
+    }
+    CCLOG("Closed udp session and dealloc all resources in GameThread...");
+
+    return true;
+}
+
+bool DelayNoMore::UdpSession::punchToServer(CHARC* const srvIp, int const srvPort, BYTEC* const bytes, size_t bytesLen, int const udpTunnelSrvPort, BYTEC* const udpTunnelBytes, size_t udpTunnelBytesBytesLen) {
+    memset(SRV_IP, 0, sizeof SRV_IP);
+    memcpy(SRV_IP, srvIp, strlen(srvIp));
+    SRV_PORT = srvPort;
+    UDP_TUNNEL_SRV_PORT = udpTunnelSrvPort;
+
+    struct sockaddr_in udpPunchingServerDestAddr;
+    uv_ip4_addr(SRV_IP, SRV_PORT, &udpPunchingServerDestAddr);
+    udpPunchingServerAddr.sockAddrIn = udpPunchingServerDestAddr;
+
+    struct sockaddr_in udpTunnelDestAddr;
+    uv_ip4_addr(SRV_IP, UDP_TUNNEL_SRV_PORT, &udpTunnelDestAddr);
+    udpTunnelAddr.sockAddrIn = udpTunnelDestAddr;
+
+    /*
+    Libuv is really inconvenient here, neither "uv_queue_work" nor "uv_async_init" is threadsafe(http ://docs.libuv.org/en/v1.x/threadpool.html#c.uv_queue_work)! What's the point of such a queue? It's even more difficult than writing my own implementation -- again a threadsafe RingBuff could be used to the rescue, yet I'd like to investigate more into how to make the following threadsafe APIs with minimum cross-platform C++ codes
+    - _sendMessage(...), should be both non-blocking & threadsafe, called from GameThread
+    - _onRead(...), should be called first in UvRecvThread in an edge-triggered manner like idiomatic "epoll" or "kqueue", then dispatch the received message to GameThread by a threadsafe RingBuff
+    */ 
+    
+    uv_mutex_lock(&sendRingBuffLock);
+    sendRingBuff->put(bytes, bytesLen, &udpPunchingServerAddr);
+    sendRingBuff->put(udpTunnelBytes, udpTunnelBytesBytesLen, &udpTunnelAddr);
+    uv_mutex_unlock(&sendRingBuffLock);
+    uv_async_send(&uvSendLoopTriggerSig);
+
+    return true;
+}
+
+bool DelayNoMore::UdpSession::upsertPeerUdpAddr(struct PeerAddr* newPeerAddrList, int roomCapacity, int selfJoinIndex) {
+    // Call timer for multiple sendings from JavaScript?
+    CCLOG("upsertPeerUdpAddr called by js for roomCapacity=%d, selfJoinIndex=%d.", roomCapacity, selfJoinIndex);
+
+    uv_mutex_lock(&sendRingBuffLock);
+    for (int i = 0; i < roomCapacity; i++) {
+        if (i == selfJoinIndex - 1) continue;
+        struct PeerAddr* cand = (newPeerAddrList + i);
+        if (NULL == cand || 0 == cand->sockAddrIn.sin_port) continue; // Not initialized 
+        peerAddrList[i].sockAddrIn = cand->sockAddrIn;
+        peerAddrList[i].authKey = cand->authKey;
+        sendRingBuff->put("foobar", 6, &(peerAddrList[i])); // Content hardcoded for now
+    }
+    uv_mutex_unlock(&sendRingBuffLock);
+    uv_async_send(&uvSendLoopTriggerSig);
+
+    return true;
+}
+
+bool DelayNoMore::UdpSession::broadcastInputFrameUpsync(BYTEC* const bytes, size_t bytesLen, int roomCapacity, int selfJoinIndex) {
+    uv_mutex_lock(&sendRingBuffLock); 
+    // Might want to send several times for better arrival rate
+    for (int j = 0; j < broadcastUpsyncCnt; j++) {
+        // Send to room udp tunnel in case of hole punching failure
+        sendRingBuff->put(bytes, bytesLen, &udpTunnelAddr);
+        for (int i = 0; i < roomCapacity; i++) {
+            if (i + 1 == selfJoinIndex) {
+                continue;
+            }
+            if (0 == peerAddrList[i].sockAddrIn.sin_port) {
+                // Peer addr not initialized
+                continue;
+            }
+
+            sendRingBuff->put(bytes, bytesLen, &(peerAddrList[i])); // Content hardcoded for now
+        }
+    }
+
+    uv_mutex_unlock(&sendRingBuffLock);
+    uv_async_send(&uvSendLoopTriggerSig);
+
+    return true;
+}

frontend/build-templates/jsb-link/frameworks/runtime-src/Classes/udp_session.hpp

@@ -0,0 +1,19 @@
+#ifndef udp_session_hpp
+#define udp_session_hpp
+
+#include "send_ring_buff.hpp"
+
+int const maxPeerCnt = 10;
+
+namespace DelayNoMore {
+    class UdpSession {
+    public:
+        static bool openUdpSession(int port);
+        static bool closeUdpSession();
+        static bool upsertPeerUdpAddr(struct PeerAddr* newPeerAddrList, int roomCapacity, int selfJoinIndex);
+        //static bool clearPeerUDPAddrList();
+        static bool punchToServer(CHARC* const srvIp, int const srvPort, BYTEC* const bytes, size_t bytesLen, int const udpTunnelSrvPort, BYTEC* const udpTunnelBytes, size_t udpTunnelBytesBytesLen);
+        static bool broadcastInputFrameUpsync(BYTEC* const bytes, size_t bytesLen, int roomCapacity, int selfJoinIndex);
+    };
+}
+#endif

frontend/build-templates/jsb-link/frameworks/runtime-src/Classes/udp_session_bridge.cpp

@@ -0,0 +1,169 @@
+#include "udp_session.hpp"
+#include "base/ccMacros.h"
+#include "scripting/js-bindings/manual/jsb_conversions.hpp"
+
+bool openUdpSession(se::State& s) {
+    const auto& args = s.args();
+    size_t argc = args.size();
+    CC_UNUSED bool ok = true;
+    if (1 == argc && args[0].isNumber()) {
+        SE_PRECONDITION2(ok, false, "openUdpSession: Error processing arguments");
+        int port = args[0].toInt32();
+
+        return DelayNoMore::UdpSession::openUdpSession(port);
+    }
+    SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d; or wrong arg type!", (int)argc, 1);
+
+    return false;
+}
+SE_BIND_FUNC(openUdpSession)
+
+bool punchToServer(se::State& s) {
+    const auto& args = s.args();
+    size_t argc = args.size();
+    CC_UNUSED bool ok = true;
+    if (5 == argc && args[0].isString() && args[1].isNumber() && args[2].isObject() && args[2].toObject()->isTypedArray()
+        && args[3].isNumber() && args[4].isObject() && args[4].toObject()->isTypedArray()
+        ) {
+        SE_PRECONDITION2(ok, false, "punchToServer: Error processing arguments");
+        CHARC* srvIp = args[0].toString().c_str();
+        int srvPort = args[1].toInt32();
+        BYTEC bytes[maxUdpPayloadBytes];
+        memset(bytes, 0, sizeof bytes);
+        se::Object* obj = args[2].toObject();
+        size_t sz = 0;
+        uint8_t* ptr = NULL;
+        obj->getTypedArrayData(&ptr, &sz);
+        for (size_t i = 0; i < sz; i++) {
+            bytes[i] = (char)(*(ptr + i));
+        }
+
+        int udpTunnelSrvPort = args[3].toInt32();
+        BYTEC udpTunnelBytes[maxUdpPayloadBytes];
+        memset(udpTunnelBytes, 0, sizeof udpTunnelBytes);
+        se::Object* udpTunnelObj = args[4].toObject();
+        size_t udpTunnelSz = 0;
+        uint8_t* udpTunnelPtr = NULL;
+        udpTunnelObj->getTypedArrayData(&udpTunnelPtr, &udpTunnelSz);
+        for (size_t i = 0; i < udpTunnelSz; i++) {
+            udpTunnelBytes[i] = (char)(*(udpTunnelPtr + i));
+        }
+
+        CCLOG("Should punch %s:%d by %d bytes; should punch udp tunnel %s:%d by %d bytes.", srvIp, srvPort, sz, srvIp, udpTunnelSrvPort, udpTunnelSz);
+        return DelayNoMore::UdpSession::punchToServer(srvIp, srvPort, bytes, sz, udpTunnelSrvPort, udpTunnelBytes, udpTunnelSz);
+    }
+    SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d; or wrong arg type!", (int)argc, 5);
+    return false;
+}
+SE_BIND_FUNC(punchToServer)
+
+bool broadcastInputFrameUpsync(se::State& s) {
+    const auto& args = s.args();
+    size_t argc = args.size();
+    CC_UNUSED bool ok = true;
+    if (3 == argc && args[0].toObject()->isTypedArray() && args[1].isNumber() && args[2].isNumber()) {
+        SE_PRECONDITION2(ok, false, "broadcastInputFrameUpsync: Error processing arguments");
+        BYTEC bytes[1024];
+        memset(bytes, 0, sizeof bytes);
+        se::Object* obj = args[0].toObject();
+        size_t sz = 0;
+        uint8_t* ptr = NULL;
+        obj->getTypedArrayData(&ptr, &sz);
+        for (size_t i = 0; i < sz; i++) {
+            bytes[i] = (char)(*(ptr + i));
+        }
+        int roomCapacity = args[1].toInt32();
+        int selfJoinIndex = args[2].toInt32();
+        CCLOG("Should broadcastInputFrameUpsync %u bytes; roomCapacity=%d, selfJoinIndex=%d.", sz, roomCapacity, selfJoinIndex);
+        return DelayNoMore::UdpSession::broadcastInputFrameUpsync(bytes, sz, roomCapacity, selfJoinIndex);
+    }
+    SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d; or wrong arg type!", (int)argc, 3);
+    return false;
+}
+SE_BIND_FUNC(broadcastInputFrameUpsync)
+
+bool closeUdpSession(se::State& s) {
+    const auto& args = s.args();
+    size_t argc = args.size();
+    CC_UNUSED bool ok = true;
+    if (0 == argc) {
+        SE_PRECONDITION2(ok, false, "closeUdpSession: Error processing arguments");
+        return DelayNoMore::UdpSession::closeUdpSession();
+    }
+    SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0);
+
+    return false;
+}
+SE_BIND_FUNC(closeUdpSession)
+
+struct PeerAddr newPeerAddrList[maxPeerCnt];
+bool upsertPeerUdpAddr(se::State& s) {
+    const auto& args = s.args();
+    size_t argc = args.size();
+    CC_UNUSED bool ok = true;
+    if (3 == argc && args[0].isObject() && args[0].toObject()->isArray() && args[1].isNumber() && args[2].isNumber()) {
+        SE_PRECONDITION2(ok, false, "upsertPeerUdpAddr: Error processing arguments");
+        int roomCapacity = args[1].toInt32();
+        int selfJoinIndex = args[2].toInt32();
+        se::Object* newPeerAddrValArr = args[0].toObject();
+        for (int i = 0; i < roomCapacity; i++) {
+            se::Value newPeerAddrVal;
+            newPeerAddrValArr->getArrayElement(i, &newPeerAddrVal);
+            se::Object* newPeerAddrObj = newPeerAddrVal.toObject();
+            se::Value newIp, newPort, newAuthKey;
+            newPeerAddrObj->getProperty("ip", &newIp);
+            newPeerAddrObj->getProperty("port", &newPort);
+            newPeerAddrObj->getProperty("authKey", &newAuthKey);
+            uv_ip4_addr(newIp.toString().c_str(), newPort.toInt32(), &(newPeerAddrList[i].sockAddrIn));
+            newPeerAddrList[i].authKey = newAuthKey.toInt32();
+        }
+
+        return DelayNoMore::UdpSession::upsertPeerUdpAddr(newPeerAddrList, roomCapacity, selfJoinIndex);
+    }
+    SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d; or wrong arg type!", (int)argc, 3);
+    
+    return false;
+}
+SE_BIND_FUNC(upsertPeerUdpAddr)
+
+static bool udpSessionFinalize(se::State& s) {
+    CCLOGINFO("jsbindings: finalizing JS object %p (DelayNoMore::UdpSession)", s.nativeThisObject());
+    auto iter = se::NonRefNativePtrCreatedByCtorMap::find(s.nativeThisObject());
+    if (iter != se::NonRefNativePtrCreatedByCtorMap::end()) {
+        se::NonRefNativePtrCreatedByCtorMap::erase(iter);
+        DelayNoMore::UdpSession* cobj = (DelayNoMore::UdpSession*)s.nativeThisObject();
+        delete cobj;
+    }
+    return true;
+}
+SE_BIND_FINALIZE_FUNC(udpSessionFinalize)
+
+se::Object* __jsb_udp_session_proto = nullptr;
+se::Class* __jsb_udp_session_class = nullptr;
+bool registerUdpSession(se::Object* obj) {
+    // Get the ns
+    se::Value nsVal;
+    if (!obj->getProperty("DelayNoMore", &nsVal))
+    {
+        se::HandleObject jsobj(se::Object::createPlainObject());
+        nsVal.setObject(jsobj);
+        obj->setProperty("DelayNoMore", nsVal);
+    }
+    
+    se::Object* ns = nsVal.toObject();
+    auto cls = se::Class::create("UdpSession", ns, nullptr, nullptr);
+
+    cls->defineStaticFunction("openUdpSession", _SE(openUdpSession));
+    cls->defineStaticFunction("punchToServer", _SE(punchToServer));
+    cls->defineStaticFunction("broadcastInputFrameUpsync", _SE(broadcastInputFrameUpsync));
+    cls->defineStaticFunction("closeUdpSession", _SE(closeUdpSession));
+    cls->defineStaticFunction("upsertPeerUdpAddr", _SE(upsertPeerUdpAddr));
+    cls->defineFinalizeFunction(_SE(udpSessionFinalize));
+    cls->install();
+    
+    JSBClassType::registerClass<DelayNoMore::UdpSession>(cls);
+    __jsb_udp_session_proto = cls->getProto();
+    __jsb_udp_session_class = cls;
+    se::ScriptEngine::getInstance()->clearException();
+    return true;
+}

frontend/build-templates/jsb-link/frameworks/runtime-src/Classes/udp_session_bridge.hpp

@@ -0,0 +1,19 @@
+#ifndef udp_session_bridge_hpp
+#define udp_session_bridge_hpp
+
+#pragma once
+#include "base/ccConfig.h"
+#include "cocos/scripting/js-bindings/jswrapper/SeApi.h"
+
+extern se::Object* __jsb_udp_session_proto;
+extern se::Class* __jsb_udp_session_class;
+
+bool registerUdpSession(se::Object* obj);
+
+SE_DECLARE_FUNC(openUdpSession);
+SE_DECLARE_FUNC(punchToServer);
+SE_DECLARE_FUNC(broadcastInputFrameUpsync);
+SE_DECLARE_FUNC(closeUdpSession);
+SE_DECLARE_FUNC(upsertPeerUdpAddr);
+
+#endif

frontend/build-templates/jsb-link/frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.genxium.delaynomore"
+    android:installLocation="auto">
+
+    <uses-feature android:glEsVersion="0x00020000" />
+
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+
+    <!-- TODO: Remove "usesCleartextTraffic" in production -->
+    <application
+        android:allowBackup="true"
+        android:label="@string/app_name"
+        android:usesCleartextTraffic="true"
+        android:icon="@mipmap/ic_launcher">
+        
+        <!-- Tell Cocos2dxActivity the name of our .so -->
+        <meta-data android:name="android.app.lib_name"
+                   android:value="cocos2djs" />
+        
+        <activity
+            android:name="org.cocos2dx.javascript.AppActivity"
+            android:screenOrientation="sensorLandscape"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:label="@string/app_name"
+            android:usesCleartextTraffic="true"
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+            android:launchMode="singleTask"
+            android:taskAffinity="" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+    
+</manifest>

frontend/build-templates/jsb-link/frameworks/runtime-src/proj.android-studio/app/jni/Android.mk

@@ -0,0 +1,26 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := cocos2djs_shared
+
+LOCAL_MODULE_FILENAME := libcocos2djs
+
+ifeq ($(USE_ARM_MODE),1)
+LOCAL_ARM_MODE := arm
+endif
+
+LOCAL_SRC_FILES := hellojavascript/main.cpp \
+				   ../../../Classes/AppDelegate.cpp \
+				   ../../../Classes/jsb_module_register.cpp \
+				   ../../../Classes/udp_session.cpp \
+				   ../../../Classes/udp_session_bridge.cpp \
+				   ../../../Classes/send_ring_buff.cpp 
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../Classes
+
+LOCAL_STATIC_LIBRARIES := cocos2dx_static
+
+include $(BUILD_SHARED_LIBRARY)
+
+$(call import-module, cocos)

frontend/build-templates/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java

@@ -0,0 +1,119 @@
+/****************************************************************************
+Copyright (c) 2015-2016 Chukong Technologies Inc.
+Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+ 
+http://www.cocos2d-x.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+****************************************************************************/
+package org.cocos2dx.javascript;
+
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.os.Bundle;
+
+import org.cocos2dx.lib.Cocos2dxActivity;
+import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
+
+public class AppActivity extends Cocos2dxActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // Workaround in https://stackoverflow.com/questions/16283079/re-launch-of-activity-on-home-button-but-only-the-first-time/16447508
+        if (!isTaskRoot()) {
+            // Android launched another instance of the root activity into an existing task
+            //  so just quietly finish and go away, dropping the user back into the activity
+            //  at the top of the stack (ie: the last state of this task)
+            // Don't need to finish it again since it's finished in super.onCreate .
+            return;
+        }
+        // DO OTHER INITIALIZATION BELOW
+
+    }
+    
+    @Override
+    public Cocos2dxGLSurfaceView onCreateView() {
+        Cocos2dxGLSurfaceView glSurfaceView = new Cocos2dxGLSurfaceView(this);
+        // TestCpp should create stencil buffer
+        glSurfaceView.setEGLConfigChooser(5, 6, 5, 0, 16, 8);
+
+        return glSurfaceView;
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+    }
+
+    @Override
+    protected void onRestart() {
+        super.onRestart();
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+    }
+        
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+    }
+}

frontend/build-templates/jsb-link/frameworks/runtime-src/proj.android-studio/build.gradle

@@ -0,0 +1,30 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.2.0'
+
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+        flatDir {
+            dirs 'libs'
+        }
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

frontend/build-templates/jsb-link/frameworks/runtime-src/proj.win32/DelayNoMore.vcxproj

@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{3B0B58B1-2734-488E-A542-ECEC11EB2455}</ProjectGuid>
+    <RootNamespace>DelayNoMore</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v140_xp</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v140_xp</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v140_xp</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v140_xp</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="C:\CocosCreator_2.2.1\resources\cocos2d-x\build\cocos2dx.props" />
+    <Import Project="C:\CocosCreator_2.2.1\resources\cocos2d-x\build\cocos2d_headers.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="C:\CocosCreator_2.2.1\resources\cocos2d-x\build\cocos2dx.props" />
+    <Import Project="C:\CocosCreator_2.2.1\resources\cocos2d-x\build\cocos2d_headers.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration).win32\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration).win32\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>false</MkTypLibCompatible>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <GenerateStublessProxies>true</GenerateStublessProxies>
+      <TypeLibraryName>$(IntDir)game.tlb</TypeLibraryName>
+      <HeaderFileName>game.h</HeaderFileName>
+      <DllDataFileName>
+      </DllDataFileName>
+      <InterfaceIdentifierFileName>game_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>game_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\scripting\js-bindings\auto;$(EngineRoot)cocos\scripting\js-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\win32\include\;$(EngineRoot)external\win32\include\v8;$(EngineRoot)extensions;$(EngineRoot)cocos\editor-support;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_DEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USRLIBSIMSTATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DisableSpecificWarnings>4267;4251;4244;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <PreLinkEvent>
+      <Command>
+      </Command>
+    </PreLinkEvent>
+    <Link>
+      <AdditionalDependencies>v8.dll.lib;v8_libbase.dll.lib;v8_libplatform.dll.lib;libuv.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup>
+    <CustomBuildStep>
+      <Command>xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\src" /D /E /I /F /Y
+xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\res" /D /E /I /F /Y
+xcopy "$(ProjectDir)..\..\..\jsb-adapter" "$(OutDir)\jsb-adapter" /D /E /I /F /Y
+copy "$(ProjectDir)..\..\..\main.js" "$(OutDir)\" /Y
+copy "$(ProjectDir)..\..\..\project.json" "$(OutDir)\" /Y</Command>
+      <Outputs>$(TargetName).cab</Outputs>
+      <Inputs>$(TargetFileName)</Inputs>
+    </CustomBuildStep>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>false</MkTypLibCompatible>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <GenerateStublessProxies>true</GenerateStublessProxies>
+      <TypeLibraryName>$(IntDir)game.tlb</TypeLibraryName>
+      <HeaderFileName>game.h</HeaderFileName>
+      <DllDataFileName>
+      </DllDataFileName>
+      <InterfaceIdentifierFileName>game_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>game_p.c</ProxyFileName>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\scripting\js-bindings\auto;$(EngineRoot)cocos\scripting\js-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\win32\include\;$(EngineRoot)external\win32\include\v8;$(EngineRoot)extensions;$(EngineRoot)cocos\editor-support;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;NDEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USRLIBSIMSTATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <DisableSpecificWarnings>4267;4251;4244;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <PreLinkEvent>
+      <Command>
+      </Command>
+    </PreLinkEvent>
+    <Link>
+      <AdditionalDependencies>v8.dll.lib;v8_libbase.dll.lib;v8_libplatform.dll.lib;libuv.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Classes\jsb_module_register.cpp" />
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="..\Classes\AppDelegate.cpp" />
+    <ClCompile Include="..\Classes\udp_session.cpp" />
+    <ClCompile Include="..\Classes\udp_session_bridge.cpp" />
+    <ClCompile Include="..\Classes\send_ring_buff.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="main.h" />
+    <ClInclude Include="..\Classes\send_ring_buff.hpp" />
+    <ClInclude Include="..\Classes\udp_session.hpp" />
+    <ClInclude Include="..\Classes\udp_session_bridge.hpp" />
+    <ClInclude Include="..\Classes\AppDelegate.h" />
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="game.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="res\game.ico" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

frontend/build-templates/jsb-link/frameworks/runtime-src/proj.win32/DelayNoMore.vcxproj.filters

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="resource">
+      <UniqueIdentifier>{ca9c9e15-d942-43a1-aa7a-5f0b74ca1afd}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;png;manifest</Extensions>
+    </Filter>
+    <Filter Include="win32">
+      <UniqueIdentifier>{ccb2323b-1cfa-41ea-bcf4-ba5f07309396}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Classes">
+      <UniqueIdentifier>{e93a77e1-af1e-4400-87d3-504b62ebdbb0}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="main.cpp">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\AppDelegate.cpp">
+      <Filter>Classes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\jsb_module_register.cpp">
+      <Filter>Classes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\send_ring_buff.cpp">
+      <Filter>Classes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\udp_session.cpp">
+      <Filter>Classes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\udp_session_bridge.cpp">
+      <Filter>Classes</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Classes\AppDelegate.h">
+      <Filter>Classes</Filter>
+    </ClInclude>
+    <ClInclude Include="main.h">
+      <Filter>win32</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="..\Classes\send_ring_buff.hpp">
+      <Filter>Classes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Classes\udp_session.hpp">
+      <Filter>Classes</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Classes\udp_session_bridge.hpp">
+      <Filter>Classes</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="game.rc">
+      <Filter>resource</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="res\game.ico">
+      <Filter>resource</Filter>
+    </Image>
+  </ItemGroup>
+</Project>

frontend/settings/builder.json

@@ -2,7 +2,7 @@
   "android-instant": {
     "REMOTE_SERVER_ROOT": "",
     "host": "",
-    "packageName": "org.cocos2d.helloworld",
+    "packageName": "org.genxium.delaynomore",
     "pathPattern": "",
     "recordPath": "",
     "scheme": "https",
@@ -15,14 +15,14 @@
     "orientation": "portrait",
     "subContext": ""
   },
-  "encryptJs": true,
+  "encryptJs": false,
   "excludeScenes": [
     "8491a86c-bec9-4813-968a-128ca01639e0"
   ],
   "fb-instant-games": {},
   "includeSDKBox": false,
   "inlineSpriteFrames": true,
-  "inlineSpriteFrames_native": true,
+  "inlineSpriteFrames_native": false,
   "md5Cache": false,
   "mergeStartScene": true,
   "optimizeHotUpdate": false,
@@ -32,14 +32,14 @@
     "portrait": false,
     "upsideDown": false
   },
-  "packageName": "org.cocos2d.helloworld",
+  "packageName": "org.genxium.delaynomore",
   "qqplay": {
     "REMOTE_SERVER_ROOT": "",
     "orientation": "portrait"
   },
   "startScene": "2ff474d9-0c9e-4fe3-87ec-fbff7cae85b4",
   "title": "DelayNoMore",
-  "webOrientation": "portrait",
+  "webOrientation": "landscape",
   "wechatgame": {
     "REMOTE_SERVER_ROOT": "https://bgmoba.lokcol.com/static/",
     "appid": "wxf497c910a2a25edc",
@@ -48,13 +48,14 @@
   "xxteaKey": "4d54a3d5-e6f3-49",
   "zipCompressJs": true,
   "android": {
-    "packageName": "org.cocos2d.helloworld"
+    "packageName": "org.genxium.delaynomore"
   },
   "ios": {
-    "packageName": "org.cocos2d.helloworld"
+    "packageName": "org.genxium.delaynomore"
   },
   "mac": {
-    "packageName": "org.cocos2d.helloworld"
+    "packageName": "org.genxium.delaynomore"
   },
-  "win32": {}
+  "win32": {},
+  "includeAnySDK": false
 }

frontend/settings/builder.panel.json

@@ -1,7 +1,7 @@
 {
   "excludeScenes": [],
-  "packageName": "org.cocos2d.helloworld",
-  "platform": "web-mobile",
+  "packageName": "org.genxium.delaynomore",
+  "platform": "android",
   "startScene": "2d2f792f-a40c-49bb-a189-ed176a246e49",
-  "title": "HelloWorld"
-}
+  "title": "DelayNoMore"
+}

frontend/settings/project.json

@@ -33,15 +33,23 @@
   "design-resolution-height": 640,
   "design-resolution-width": 960,
   "excluded-modules": [
+    "Audio",
+    "AudioSource",
     "Collider",
+    "DragonBones",
     "Geom Utils",
+    "Intersection",
     "Mesh",
     "MotionStreak",
+    "NodePool",
     "Physics",
     "PageView",
     "PageViewIndicator",
+    "ParticleSystem",
     "RichText",
     "Slider",
+    "ScrollBar",
+    "ScrollView",
     "Spine Skeleton",
     "StudioComponent",
     "VideoPlayer",
@@ -68,7 +76,7 @@
     "shelter_z_reducer",
     "shelter"
   ],
-  "last-module-event-record-time": 1673930863015,
+  "last-module-event-record-time": 1675852779064,
   "simulator-orientation": false,
   "simulator-resolution": {
     "height": 640,

frontend/template.json

@@ -1,5 +1,5 @@
 {
-	"name": "TEMPLATES.helloworld.name",
-	"desc": "TEMPLATES.helloworld.desc",
+	"name": "DelayNoMore",
+	"desc": "DelayNoMore",
 	"banner": "template-banner.png"
-}
+}

jsexport/Makefile

@@ -4,24 +4,25 @@ all: help
 ## Available proxies for downloading go modules are listed in "https://github.com/golang/go/wiki/Modules#how-do-i-use-vendoring-with-modules-is-vendoring-going-away". 
 #GOPROXY=https://mirrors.aliyun.com/goproxy 
 GOPROXY=https://goproxy.io
+DST=../frontend/assets/scripts/modules
 
 serve:
 	gopherjs serve $(PROJECTNAME)
 
 clean: 
 	gopherjs clean
-	rm -f ../frontend/assets/plugin_scripts/jsexport.js
-	#rm -f ../frontend/assets/plugin_scripts/jsexport.js.map
+	rm -f $(DST)/jsexport.js
+	#rm -f $(DST)/jsexport.js.map
 
 build: clean
 	gopherjs build $(PROJECTNAME)
-	mv ./jsexport.js ../frontend/assets/plugin_scripts/	
-	#mv ./jsexport.js.map ../frontend/assets/plugin_scripts/
+	mv ./jsexport.js $(DST)/	
+	#mv ./jsexport.js.map $(DST)/
 
 build-min: clean
 	gopherjs build -m $(PROJECTNAME)
-	mv ./jsexport.js ../frontend/assets/plugin_scripts/	
-	#mv ./jsexport.js.map ../frontend/assets/plugin_scripts/
+	mv ./jsexport.js $(DST)/	
+	#mv ./jsexport.js.map $(DST)/
 
 .PHONY: help
 

jsexport/battle/battle.go

@@ -22,15 +22,22 @@ 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(4)  // in the count of render frames
+	INPUT_DELAY_FRAMES = int32(6) // in the count of render frames
+
+	/*
+	   [WARNING]
+	   Experimentally having an input rate > 15 (e.g., 60 >> 2) doesn't improve multiplayer smoothness, in fact higher input rate often results in higher packet loss (both TCP and UDP) thus higher wrong prediction rate!
+	*/
 	INPUT_SCALE_FRAMES = uint32(2) // 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)
+	MAGIC_FRAMES_TO_BE_ONWALL    = int32(12)
+
+	DYING_FRAMES_TO_RECOVER = int32(60) // MUST BE SAME FOR EVERY CHARACTER FOR FAIRNESS!
 
 	NO_SKILL     = -1
 	NO_SKILL_HIT = -1
@@ -79,6 +86,7 @@ const (
 	ATK_CHARACTER_STATE_ONWALL  = int32(16)
 
 	ATK_CHARACTER_STATE_TURNAROUND = int32(17)
+	ATK_CHARACTER_STATE_DYING      = int32(18)
 )
 
 var inAirSet = map[int32]bool{
@@ -95,13 +103,15 @@ var noOpSet = map[int32]bool{
 	ATK_CHARACTER_STATE_INAIR_ATKED1: true,
 	ATK_CHARACTER_STATE_BLOWN_UP1:    true,
 	ATK_CHARACTER_STATE_LAY_DOWN1:    true,
-	// During the invinsible frames of GET_UP1, the player is allowed to take any action
+	// [WARNING] During the invinsible frames of GET_UP1, the player is allowed to take any action
+	ATK_CHARACTER_STATE_DYING: true,
 }
 
 var invinsibleSet = map[int32]bool{
 	ATK_CHARACTER_STATE_BLOWN_UP1: true,
 	ATK_CHARACTER_STATE_LAY_DOWN1: true,
 	ATK_CHARACTER_STATE_GET_UP1:   true,
+	ATK_CHARACTER_STATE_DYING:     true,
 }
 
 var nonAttackingSet = map[int32]bool{
@@ -114,6 +124,7 @@ var nonAttackingSet = map[int32]bool{
 	ATK_CHARACTER_STATE_BLOWN_UP1:           true,
 	ATK_CHARACTER_STATE_LAY_DOWN1:           true,
 	ATK_CHARACTER_STATE_GET_UP1:             true,
+	ATK_CHARACTER_STATE_DYING:               true,
 }
 
 func intAbs(x int32) int32 {
@@ -487,7 +498,7 @@ func deriveOpPattern(currPlayerDownsync, thatPlayerInNextFrame *PlayerDownsync,
 	canJumpWithinInertia := currPlayerDownsync.CapturedByInertia && ((chConfig.InertiaFramesToRecover >> 1) > currPlayerDownsync.FramesToRecover)
 	if 0 == currPlayerDownsync.FramesToRecover || canJumpWithinInertia {
 		if decodedInput.BtnBLevel > prevBtnBLevel {
-			if chConfig.DashingEnabled && 0 > decodedInput.Dy {
+			if chConfig.DashingEnabled && 0 > decodedInput.Dy && ATK_CHARACTER_STATE_DASHING != currPlayerDownsync.CharacterState {
 				// Checking "DashingEnabled" here to allow jumping when dashing-disabled players pressed "DOWN + BtnB"
 				patternId = 5
 			} else if _, existent := inAirSet[currPlayerDownsync.CharacterState]; !existent {
@@ -517,7 +528,31 @@ func deriveOpPattern(currPlayerDownsync, thatPlayerInNextFrame *PlayerDownsync,
 	return patternId, jumpedOrNot, effDx, effDy
 }
 
-// [WARNING] The params of this method is carefully tuned such that only "battle.RoomDownsyncFrame" is a necessary custom struct.
+/*
+[LONG TERM PERFORMANCE ENHANCEMENT PLAN]
+
+The function "ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame" is creating new heap-memory blocks at 60fps, e.g. nextRenderFramePlayers & nextRenderFrameMeleeBullets & nextRenderFrameFireballBullets & effPushbacks & hardPushbackNorms & jumpedOrNotList & playerColliders & bulletColliders, which would induce "possibly performance impacting garbage collections" when many rooms are running simultaneously.
+
+It's not easy to remove all of the dynamic heap-memory blocks allocation/deallocation, but we can reduce them to some extent. For example, the creation of new "RoomDownsyncFrame" in heap-memory can be avoided by adding
+
+```
+func overwriteRoomDownsyncFrame(src *RoomDownsyncFrame, dst *RoomDownsyncFrame) {
+    // Copy "src" into "dst" down to every primitive field; as for a same room, the "RenderFrameBuffer" is always accessed (R & W) by a same kernel thread (both frontend & backend), no thread-safety concern here
+}
+
+type Room struct {
+    newRoomDownsyncFrameHolder *RoomDownsyncFrame
+}
+
+func (pR *Room) provisionNewRoomDownsyncFrameHolder(src *RoomDownsyncFrame) {
+    overwriteRoomDownsyncFrame(src, pR.newRoomDownsyncFrameHolder)
+}
+```
+
+then pass in the whole "renderFrameBuffer *SpecificRingBuffer" to this function and overwrite the target slot IN-PLACE, i.e. need write new "SpecificRingBuffer.Put/SetByFrameId" to use the new function "overwriteRoomDownsyncFrame(src, dst)" to keep "%p of every SpecificRingBuffer.Eles[i]" constant.
+
+However, the enhancement for "playerColliders & bulletColliders" of each room is even more difficult, because the feasibility of doing in-place overwrites depends on the collision library in use.
+*/
 func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer, currRenderFrame *RoomDownsyncFrame, collisionSys *resolv.Space, collisionSysMap map[int32]*resolv.Object, collisionSpaceOffsetX, collisionSpaceOffsetY float64, chConfigsOrderedByJoinIndex []*CharacterConfig) *RoomDownsyncFrame {
 	// [WARNING] On backend this function MUST BE called while "InputsBufferLock" is locked!
 	roomCapacity := len(currRenderFrame.PlayersArr)
@@ -525,32 +560,36 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 	// Make a copy first
 	for i, currPlayerDownsync := range currRenderFrame.PlayersArr {
 		nextRenderFramePlayers[i] = &PlayerDownsync{
-			Id:                currPlayerDownsync.Id,
-			VirtualGridX:      currPlayerDownsync.VirtualGridX,
-			VirtualGridY:      currPlayerDownsync.VirtualGridY,
-			DirX:              currPlayerDownsync.DirX,
-			DirY:              currPlayerDownsync.DirY,
-			VelX:              currPlayerDownsync.VelX,
-			VelY:              currPlayerDownsync.VelY,
-			CharacterState:    currPlayerDownsync.CharacterState,
-			InAir:             true,
-			OnWall:            false,
-			Speed:             currPlayerDownsync.Speed,
-			BattleState:       currPlayerDownsync.BattleState,
-			Score:             currPlayerDownsync.Score,
-			Removed:           currPlayerDownsync.Removed,
-			JoinIndex:         currPlayerDownsync.JoinIndex,
-			Hp:                currPlayerDownsync.Hp,
-			MaxHp:             currPlayerDownsync.MaxHp,
-			FramesToRecover:   currPlayerDownsync.FramesToRecover - 1,
-			FramesInChState:   currPlayerDownsync.FramesInChState + 1,
-			ActiveSkillId:     currPlayerDownsync.ActiveSkillId,
-			ActiveSkillHit:    currPlayerDownsync.ActiveSkillHit,
-			FramesInvinsible:  currPlayerDownsync.FramesInvinsible - 1,
-			ColliderRadius:    currPlayerDownsync.ColliderRadius,
-			OnWallNormX:       currPlayerDownsync.OnWallNormX,
-			OnWallNormY:       currPlayerDownsync.OnWallNormY,
-			CapturedByInertia: currPlayerDownsync.CapturedByInertia,
+			Id:                  currPlayerDownsync.Id,
+			VirtualGridX:        currPlayerDownsync.VirtualGridX,
+			VirtualGridY:        currPlayerDownsync.VirtualGridY,
+			DirX:                currPlayerDownsync.DirX,
+			DirY:                currPlayerDownsync.DirY,
+			VelX:                currPlayerDownsync.VelX,
+			VelY:                currPlayerDownsync.VelY,
+			CharacterState:      currPlayerDownsync.CharacterState,
+			InAir:               true,
+			OnWall:              false,
+			Speed:               currPlayerDownsync.Speed,
+			BattleState:         currPlayerDownsync.BattleState,
+			Score:               currPlayerDownsync.Score,
+			Removed:             currPlayerDownsync.Removed,
+			JoinIndex:           currPlayerDownsync.JoinIndex,
+			Hp:                  currPlayerDownsync.Hp,
+			MaxHp:               currPlayerDownsync.MaxHp,
+			FramesToRecover:     currPlayerDownsync.FramesToRecover - 1,
+			FramesInChState:     currPlayerDownsync.FramesInChState + 1,
+			ActiveSkillId:       currPlayerDownsync.ActiveSkillId,
+			ActiveSkillHit:      currPlayerDownsync.ActiveSkillHit,
+			FramesInvinsible:    currPlayerDownsync.FramesInvinsible - 1,
+			BulletTeamId:        currPlayerDownsync.BulletTeamId,
+			ChCollisionTeamId:   currPlayerDownsync.ChCollisionTeamId,
+			RevivalVirtualGridX: currPlayerDownsync.RevivalVirtualGridX,
+			RevivalVirtualGridY: currPlayerDownsync.RevivalVirtualGridY,
+			ColliderRadius:      currPlayerDownsync.ColliderRadius,
+			OnWallNormX:         currPlayerDownsync.OnWallNormX,
+			OnWallNormY:         currPlayerDownsync.OnWallNormY,
+			CapturedByInertia:   currPlayerDownsync.CapturedByInertia,
 		}
 		if nextRenderFramePlayers[i].FramesToRecover < 0 {
 			nextRenderFramePlayers[i].FramesToRecover = 0
@@ -652,10 +691,12 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 			*/
 			alignedWithInertia := true
 			exactTurningAround := false
-			if 0 == effDx && 0 != thatPlayerInNextFrame.VelX {
+			stoppingFromWalking := false
+			if 0 != effDx && 0 == thatPlayerInNextFrame.VelX {
 				alignedWithInertia = false
-			} else if 0 != effDx && 0 == thatPlayerInNextFrame.VelX {
+			} else if 0 == effDx && 0 != thatPlayerInNextFrame.VelX {
 				alignedWithInertia = false
+				stoppingFromWalking = true
 			} else if 0 > effDx*thatPlayerInNextFrame.VelX {
 				alignedWithInertia = false
 				exactTurningAround = true
@@ -669,9 +710,13 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 				*/
 				//fmt.Printf("joinIndex=%d is not wall jumping and not aligned w/ inertia\n{renderFrame.id: %d, effDx: %d, thatPlayerInNextFrame.VelX: %d}\n", currPlayerDownsync.JoinIndex, currRenderFrame.Id, effDx, thatPlayerInNextFrame.VelX)
 				thatPlayerInNextFrame.CapturedByInertia = true
-				thatPlayerInNextFrame.FramesToRecover = chConfig.InertiaFramesToRecover
 				if exactTurningAround {
 					thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_TURNAROUND
+					thatPlayerInNextFrame.FramesToRecover = chConfig.InertiaFramesToRecover
+				} else if stoppingFromWalking {
+					thatPlayerInNextFrame.FramesToRecover = chConfig.InertiaFramesToRecover
+				} else {
+					thatPlayerInNextFrame.FramesToRecover = (chConfig.InertiaFramesToRecover >> 1)
 				}
 			} else {
 				thatPlayerInNextFrame.CapturedByInertia = false
@@ -709,6 +754,12 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 		chConfig := chConfigsOrderedByJoinIndex[i]
 		// Reset playerCollider position from the "virtual grid position"
 		newVx, newVy := currPlayerDownsync.VirtualGridX+currPlayerDownsync.VelX, currPlayerDownsync.VirtualGridY+currPlayerDownsync.VelY
+		if 0 >= thatPlayerInNextFrame.Hp && 0 == thatPlayerInNextFrame.FramesToRecover {
+			// Revive
+			newVx, newVy = currPlayerDownsync.RevivalVirtualGridX, currPlayerDownsync.RevivalVirtualGridY
+			thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_IDLE1
+			thatPlayerInNextFrame.Hp = currPlayerDownsync.MaxHp
+		}
 		if jumpedOrNotList[i] {
 			// We haven't proceeded with "OnWall" calculation for "thatPlayerInNextFrame", thus use "currPlayerDownsync.OnWall" for checking
 			if ATK_CHARACTER_STATE_ONWALL == currPlayerDownsync.CharacterState {
@@ -762,38 +813,8 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 	}
 
 	// 3. Add bullet colliders into collision system
-
 	// [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!
-	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 _, 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
-				}
-			}
-			nextRenderFrameMeleeBullets = append(nextRenderFrameMeleeBullets, meleeBullet)
-		}
-	}
-
+	bulletColliders := make([]*resolv.Object, 0, ((len(currRenderFrame.MeleeBullets) + len(currRenderFrame.FireballBullets)) << 1)) // Will all be removed at the end of this function due to the need for being rollback-compatible
 	for _, prevFireball := range currRenderFrame.FireballBullets {
 		fireballBullet := &FireballBullet{
 			VirtualGridX:    prevFireball.VirtualGridX,
@@ -822,12 +843,49 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 				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 {
+				offender := currRenderFrame.PlayersArr[fireballBullet.BattleAttr.OffenderJoinIndex-1]
+				if _, existent := noOpSet[offender.CharacterState]; existent {
+					// If a fireball is not yet active but the offender got attacked, remove it
+					continue
+				}
 				//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)
 		}
 	}
 
+	for _, prevMelee := range currRenderFrame.MeleeBullets {
+		meleeBullet := &MeleeBullet{
+			Bullet:          prevMelee.Bullet,
+			BattleAttr:      prevMelee.BattleAttr,
+			FramesInBlState: prevMelee.FramesInBlState + 1,
+			BlState:         prevMelee.BlState,
+		}
+		if IsMeleeBulletAlive(meleeBullet, currRenderFrame) {
+			offender := currRenderFrame.PlayersArr[meleeBullet.BattleAttr.OffenderJoinIndex-1]
+			if _, existent := noOpSet[offender.CharacterState]; existent {
+				// If a melee is alive but the offender got attacked, remove it even if it's active
+				continue
+			}
+			if IsMeleeBulletActive(meleeBullet, currRenderFrame) {
+				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
+				}
+			}
+			nextRenderFrameMeleeBullets = append(nextRenderFrameMeleeBullets, meleeBullet)
+		}
+	}
+
 	// 4. Calc pushbacks for each player (after its movement) w/o bullets
 	for i, currPlayerDownsync := range currRenderFrame.PlayersArr {
 		joinIndex := currPlayerDownsync.JoinIndex
@@ -938,11 +996,6 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 							break
 						}
 					}
-
-					if !currPlayerDownsync.OnWall && thatPlayerInNextFrame.OnWall {
-						// To avoid mysterious climbing up the wall after sticking on it
-						thatPlayerInNextFrame.VelY = 0
-					}
 				}
 			}
 			if !thatPlayerInNextFrame.OnWall {
@@ -984,18 +1037,26 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 						if 0 > offender.DirX {
 							xfac = -xfac
 						}
-						pushbackVelX, pushbackVelY := xfac*v.Bullet.PushbackVelX, v.Bullet.PushbackVelY
 						atkedPlayerInNextFrame := nextRenderFramePlayers[t.JoinIndex-1]
-						atkedPlayerInNextFrame.VelX = pushbackVelX
-						atkedPlayerInNextFrame.VelY = pushbackVelY
-						if v.Bullet.BlowUp {
-							atkedPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_BLOWN_UP1
+						atkedPlayerInNextFrame.Hp -= v.Bullet.Damage
+						if 0 >= atkedPlayerInNextFrame.Hp {
+							// [WARNING] We don't have "dying in air" animation for now, and for better graphical recognition, play the same dying animation even in air
+							atkedPlayerInNextFrame.Hp = 0
+							atkedPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_DYING
+							atkedPlayerInNextFrame.FramesToRecover = DYING_FRAMES_TO_RECOVER
 						} else {
-							atkedPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_ATKED1
-						}
-						oldFramesToRecover := nextRenderFramePlayers[t.JoinIndex-1].FramesToRecover
-						if v.Bullet.HitStunFrames > oldFramesToRecover {
-							atkedPlayerInNextFrame.FramesToRecover = v.Bullet.HitStunFrames
+							pushbackVelX, pushbackVelY := xfac*v.Bullet.PushbackVelX, v.Bullet.PushbackVelY
+							atkedPlayerInNextFrame.VelX = pushbackVelX
+							atkedPlayerInNextFrame.VelY = pushbackVelY
+							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.Bullet.HitStunFrames > oldFramesToRecover {
+								atkedPlayerInNextFrame.FramesToRecover = v.Bullet.HitStunFrames
+							}
 						}
 					}
 				}
@@ -1024,18 +1085,26 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 						if 0 > offender.DirX {
 							xfac = -xfac
 						}
-						pushbackVelX, pushbackVelY := xfac*v.Bullet.PushbackVelX, v.Bullet.PushbackVelY
 						atkedPlayerInNextFrame := nextRenderFramePlayers[t.JoinIndex-1]
-						atkedPlayerInNextFrame.VelX = pushbackVelX
-						atkedPlayerInNextFrame.VelY = pushbackVelY
-						if v.Bullet.BlowUp {
-							atkedPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_BLOWN_UP1
+						atkedPlayerInNextFrame.Hp -= v.Bullet.Damage
+						if 0 >= atkedPlayerInNextFrame.Hp {
+							// [WARNING] We don't have "dying in air" animation for now, and for better graphical recognition, play the same dying animation even in air
+							atkedPlayerInNextFrame.Hp = 0
+							atkedPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_DYING
+							atkedPlayerInNextFrame.FramesToRecover = DYING_FRAMES_TO_RECOVER
 						} else {
-							atkedPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_ATKED1
-						}
-						oldFramesToRecover := nextRenderFramePlayers[t.JoinIndex-1].FramesToRecover
-						if v.Bullet.HitStunFrames > oldFramesToRecover {
-							atkedPlayerInNextFrame.FramesToRecover = v.Bullet.HitStunFrames
+							pushbackVelX, pushbackVelY := xfac*v.Bullet.PushbackVelX, v.Bullet.PushbackVelY
+							atkedPlayerInNextFrame.VelX = pushbackVelX
+							atkedPlayerInNextFrame.VelY = pushbackVelY
+							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.Bullet.HitStunFrames > oldFramesToRecover {
+								atkedPlayerInNextFrame.FramesToRecover = v.Bullet.HitStunFrames
+							}
 						}
 					default:
 						exploded = true
@@ -1070,9 +1139,7 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 			oldNextCharacterState := thatPlayerInNextFrame.CharacterState
 			switch oldNextCharacterState {
 			case ATK_CHARACTER_STATE_IDLE1, ATK_CHARACTER_STATE_WALKING, ATK_CHARACTER_STATE_TURNAROUND:
-				if thatPlayerInNextFrame.OnWall {
-					thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_ONWALL
-				} else if jumpedOrNotList[i] || ATK_CHARACTER_STATE_INAIR_IDLE1_BY_JUMP == currPlayerDownsync.CharacterState {
+				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
@@ -1085,6 +1152,17 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 			}
 		}
 
+		if thatPlayerInNextFrame.OnWall {
+			switch thatPlayerInNextFrame.CharacterState {
+			case ATK_CHARACTER_STATE_WALKING, ATK_CHARACTER_STATE_INAIR_IDLE1_BY_JUMP, ATK_CHARACTER_STATE_INAIR_IDLE1_NO_JUMP:
+				hasBeenOnWallChState := (ATK_CHARACTER_STATE_ONWALL == currPlayerDownsync.CharacterState)
+				hasBeenOnWallCollisionResultForSameChState := (currPlayerDownsync.OnWall && MAGIC_FRAMES_TO_BE_ONWALL <= thatPlayerInNextFrame.FramesInChState)
+				if hasBeenOnWallChState || hasBeenOnWallCollisionResultForSameChState {
+					thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_ONWALL
+				}
+			}
+		}
+
 		// Reset "FramesInChState" if "CharacterState" is changed
 		if thatPlayerInNextFrame.CharacterState != currPlayerDownsync.CharacterState {
 			thatPlayerInNextFrame.FramesInChState = 0

jsexport/battle/characterConfig.go

@@ -51,8 +51,12 @@ var Characters = map[int]*CharacterConfig{
 
 		InertiaFramesToRecover: int32(9),
 
-		DashingEnabled: false,
-		OnWallEnabled:  false,
+		DashingEnabled:             true,
+		OnWallEnabled:              true,
+		WallJumpingFramesToRecover: int32(8),                                          // 8 would be the minimum for an avg human
+		WallJumpingInitVelX:        int32(float64(2.8) * 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 {
@@ -75,6 +79,15 @@ var Characters = map[int]*CharacterConfig{
 						}
 					}
 				}
+			} else if 3 == patternId {
+				if 0 == currPlayerDownsync.FramesToRecover && !currPlayerDownsync.InAir {
+					return 15
+				}
+			} else if 5 == patternId {
+				// Dashing is already constrained by "FramesToRecover & CapturedByInertia" in "deriveOpPattern"
+				if !currPlayerDownsync.InAir {
+					return 12
+				}
 			}
 
 			// By default no skill can be fired
@@ -128,9 +141,14 @@ var Characters = map[int]*CharacterConfig{
 						}
 					}
 				}
+			} else if 3 == patternId {
+				if 0 == currPlayerDownsync.FramesToRecover && !currPlayerDownsync.InAir {
+					return 16
+				}
 			} else if 5 == patternId {
+				// Air dash allowed for this character
 				// Dashing is already constrained by "FramesToRecover & CapturedByInertia" in "deriveOpPattern"
-				return 12
+				return 13
 			}
 
 			// By default no skill can be fired
@@ -156,7 +174,7 @@ var Characters = map[int]*CharacterConfig{
 
 		InertiaFramesToRecover: int32(9),
 
-		DashingEnabled: false,
+		DashingEnabled: true,
 		OnWallEnabled:  false,
 
 		SkillMapper: func(patternId int, currPlayerDownsync *PlayerDownsync) int {
@@ -188,6 +206,11 @@ var Characters = map[int]*CharacterConfig{
 				if 0 == currPlayerDownsync.FramesToRecover && !currPlayerDownsync.InAir {
 					return 10
 				}
+			} else if 5 == patternId {
+				// Dashing is already constrained by "FramesToRecover & CapturedByInertia" in "deriveOpPattern"
+				if !currPlayerDownsync.InAir {
+					return 14
+				}
 			}
 
 			// By default no skill can be fired
@@ -492,30 +515,30 @@ var skills = map[int]*Skill{
 		},
 	},
 	10: &Skill{
-		RecoveryFrames:        int32(40),
-		RecoveryFramesOnBlock: int32(40),
-		RecoveryFramesOnHit:   int32(40),
+		RecoveryFrames:        int32(38),
+		RecoveryFramesOnBlock: int32(38),
+		RecoveryFramesOnHit:   int32(38),
 		ReleaseTriggerType:    int32(1),
 		BoundChState:          ATK_CHARACTER_STATE_ATK4,
 		Hits: []interface{}{
 			&FireballBullet{
-				Speed: int32(float64(5) * WORLD_TO_VIRTUAL_GRID_RATIO),
+				Speed: int32(float64(6) * WORLD_TO_VIRTUAL_GRID_RATIO),
 				Bullet: &BulletConfig{
-					StartupFrames:   int32(12),
+					StartupFrames:   int32(10),
 					ActiveFrames:    MAX_INT32,
 					HitStunFrames:   int32(15),
 					BlockStunFrames: int32(9),
-					Damage:          int32(20),
+					Damage:          int32(22),
 					SelfLockVelX:    NO_LOCK_VEL,
 					SelfLockVelY:    NO_LOCK_VEL,
 					PushbackVelX:    int32(float64(2) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					PushbackVelY:    int32(0),
-					HitboxOffsetX:   int32(float64(24) * WORLD_TO_VIRTUAL_GRID_RATIO),
-					HitboxOffsetY:   int32(float64(8) * WORLD_TO_VIRTUAL_GRID_RATIO),
-					HitboxSizeX:     int32(float64(48) * WORLD_TO_VIRTUAL_GRID_RATIO),
-					HitboxSizeY:     int32(float64(32) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					HitboxOffsetX:   int32(float64(32) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					HitboxOffsetY:   int32(float64(10) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					HitboxSizeX:     int32(float64(64) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					HitboxSizeY:     int32(float64(48) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					BlowUp:          false,
-					ExplosionFrames: 15,
+					ExplosionFrames: 10,
 					SpeciesId:       int32(1),
 				},
 			},
@@ -534,7 +557,7 @@ var skills = map[int]*Skill{
 					ActiveFrames:    int32(25),
 					HitStunFrames:   MAX_INT32,
 					BlockStunFrames: int32(9),
-					Damage:          int32(30),
+					Damage:          int32(35),
 					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),
@@ -551,20 +574,20 @@ var skills = map[int]*Skill{
 		},
 	},
 	12: &Skill{
-		RecoveryFrames:        int32(12),
-		RecoveryFramesOnBlock: int32(12),
-		RecoveryFramesOnHit:   int32(12),
+		RecoveryFrames:        int32(10),
+		RecoveryFramesOnBlock: int32(10),
+		RecoveryFramesOnHit:   int32(10),
 		ReleaseTriggerType:    int32(1),
 		BoundChState:          ATK_CHARACTER_STATE_DASHING,
 		Hits: []interface{}{
 			&MeleeBullet{
 				Bullet: &BulletConfig{
-					StartupFrames:   int32(0),
+					StartupFrames:   int32(3),
 					ActiveFrames:    int32(0),
-					HitStunFrames:   MAX_INT32,
+					HitStunFrames:   int32(0),
 					BlockStunFrames: int32(0),
 					Damage:          int32(0),
-					SelfLockVelX:    int32(float64(9) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					SelfLockVelX:    int32(float64(6) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					SelfLockVelY:    int32(0),
 					PushbackVelX:    NO_LOCK_VEL,
 					PushbackVelY:    NO_LOCK_VEL,
@@ -577,6 +600,120 @@ var skills = map[int]*Skill{
 			},
 		},
 	},
+	13: &Skill{
+		RecoveryFrames:        int32(12),
+		RecoveryFramesOnBlock: int32(12),
+		RecoveryFramesOnHit:   int32(12),
+		ReleaseTriggerType:    int32(1),
+		BoundChState:          ATK_CHARACTER_STATE_DASHING,
+		Hits: []interface{}{
+			&MeleeBullet{
+				Bullet: &BulletConfig{
+					StartupFrames:   int32(3),
+					ActiveFrames:    int32(0),
+					HitStunFrames:   int32(0),
+					BlockStunFrames: int32(0),
+					Damage:          int32(0),
+					SelfLockVelX:    int32(float64(8) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					SelfLockVelY:    int32(0),
+					PushbackVelX:    NO_LOCK_VEL,
+					PushbackVelY:    NO_LOCK_VEL,
+					HitboxOffsetX:   int32(0),
+					HitboxOffsetY:   int32(0),
+					HitboxSizeX:     int32(0),
+					HitboxSizeY:     int32(0),
+					BlowUp:          false,
+				},
+			},
+		},
+	},
+	14: &Skill{
+		RecoveryFrames:        int32(8),
+		RecoveryFramesOnBlock: int32(8),
+		RecoveryFramesOnHit:   int32(8),
+		ReleaseTriggerType:    int32(1),
+		BoundChState:          ATK_CHARACTER_STATE_DASHING,
+		Hits: []interface{}{
+			&MeleeBullet{
+				Bullet: &BulletConfig{
+					StartupFrames:   int32(4),
+					ActiveFrames:    int32(0),
+					HitStunFrames:   MAX_INT32,
+					BlockStunFrames: int32(0),
+					Damage:          int32(0),
+					SelfLockVelX:    int32(float64(5) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					SelfLockVelY:    int32(0),
+					PushbackVelX:    NO_LOCK_VEL,
+					PushbackVelY:    NO_LOCK_VEL,
+					HitboxOffsetX:   int32(0),
+					HitboxOffsetY:   int32(0),
+					HitboxSizeX:     int32(0),
+					HitboxSizeY:     int32(0),
+					BlowUp:          false,
+				},
+			},
+		},
+	},
+	15: &Skill{
+		RecoveryFrames:        int32(48),
+		RecoveryFramesOnBlock: int32(48),
+		RecoveryFramesOnHit:   int32(48),
+		ReleaseTriggerType:    int32(1),
+		BoundChState:          ATK_CHARACTER_STATE_ATK4,
+		Hits: []interface{}{
+			&FireballBullet{
+				Speed: int32(float64(4) * WORLD_TO_VIRTUAL_GRID_RATIO),
+				Bullet: &BulletConfig{
+					StartupFrames:   int32(12),
+					ActiveFrames:    MAX_INT32,
+					HitStunFrames:   int32(15),
+					BlockStunFrames: int32(9),
+					Damage:          int32(18),
+					SelfLockVelX:    NO_LOCK_VEL,
+					SelfLockVelY:    NO_LOCK_VEL,
+					PushbackVelX:    int32(float64(3) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					PushbackVelY:    int32(0),
+					HitboxOffsetX:   int32(float64(24) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					HitboxOffsetY:   int32(float64(8) * 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: 30,
+					SpeciesId:       int32(2),
+				},
+			},
+		},
+	},
+	16: &Skill{
+		RecoveryFrames:        int32(60),
+		RecoveryFramesOnBlock: int32(60),
+		RecoveryFramesOnHit:   int32(60),
+		ReleaseTriggerType:    int32(1),
+		BoundChState:          ATK_CHARACTER_STATE_ATK4,
+		Hits: []interface{}{
+			&FireballBullet{
+				Speed: int32(float64(4) * WORLD_TO_VIRTUAL_GRID_RATIO),
+				Bullet: &BulletConfig{
+					StartupFrames:   int32(16),
+					ActiveFrames:    MAX_INT32,
+					HitStunFrames:   MAX_INT32,
+					BlockStunFrames: int32(9),
+					Damage:          int32(30),
+					SelfLockVelX:    NO_LOCK_VEL,
+					SelfLockVelY:    NO_LOCK_VEL,
+					PushbackVelX:    int32(float64(3) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					PushbackVelY:    int32(float64(7) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					HitboxOffsetX:   int32(float64(24) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					HitboxOffsetY:   int32(float64(8) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					HitboxSizeX:     int32(float64(48) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					HitboxSizeY:     int32(float64(32) * WORLD_TO_VIRTUAL_GRID_RATIO),
+					BlowUp:          true,
+					ExplosionFrames: 30,
+					SpeciesId:       int32(3),
+				},
+			},
+		},
+	},
 	255: &Skill{
 		RecoveryFrames:        int32(30),
 		RecoveryFramesOnBlock: int32(30),

jsexport/battle/room_downsync_frame.go

@@ -46,6 +46,9 @@ type PlayerDownsync struct {
 
 	BulletTeamId      int32
 	ChCollisionTeamId int32 // not the same as "BulletTeamId", because even in the same team, we should allow inter-character collisions
+
+	RevivalVirtualGridX int32
+	RevivalVirtualGridY int32
 }
 
 type InputFrameDecoded struct {

jsexport/main.go

@@ -42,34 +42,36 @@ 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, onWall bool, onWallNormX, onWallNormY int32, capturedByInertia 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 int32, capturedByInertia bool, bulletTeamId, chCollisionTeamId int32, revivalVirtualGridX, revivalVirtualGridY int32) *js.Object {
 	return js.MakeWrapper(&PlayerDownsync{
-		Id:                id,
-		VirtualGridX:      virtualGridX,
-		VirtualGridY:      virtualGridY,
-		DirX:              dirX,
-		DirY:              dirY,
-		VelX:              velX,
-		VelY:              velY,
-		FramesToRecover:   framesToRecover,
-		FramesInChState:   framesInChState,
-		ActiveSkillId:     activeSkillId,
-		ActiveSkillHit:    activeSkillHit,
-		FramesInvinsible:  framesInvinsible,
-		Speed:             speed,
-		BattleState:       battleState,
-		CharacterState:    characterState,
-		JoinIndex:         joinIndex,
-		Hp:                hp,
-		MaxHp:             maxHp,
-		ColliderRadius:    colliderRadius,
-		InAir:             inAir,
-		OnWall:            onWall,
-		OnWallNormX:       onWallNormX,
-		OnWallNormY:       onWallNormY,
-		CapturedByInertia: capturedByInertia,
-		BulletTeamId:      bulletTeamId,
-		ChCollisionTeamId: chCollisionTeamId,
+		Id:                  id,
+		VirtualGridX:        virtualGridX,
+		VirtualGridY:        virtualGridY,
+		DirX:                dirX,
+		DirY:                dirY,
+		VelX:                velX,
+		VelY:                velY,
+		FramesToRecover:     framesToRecover,
+		FramesInChState:     framesInChState,
+		ActiveSkillId:       activeSkillId,
+		ActiveSkillHit:      activeSkillHit,
+		FramesInvinsible:    framesInvinsible,
+		Speed:               speed,
+		BattleState:         battleState,
+		CharacterState:      characterState,
+		JoinIndex:           joinIndex,
+		Hp:                  hp,
+		MaxHp:               maxHp,
+		ColliderRadius:      colliderRadius,
+		InAir:               inAir,
+		OnWall:              onWall,
+		OnWallNormX:         onWallNormX,
+		OnWallNormY:         onWallNormY,
+		CapturedByInertia:   capturedByInertia,
+		BulletTeamId:        bulletTeamId,
+		ChCollisionTeamId:   chCollisionTeamId,
+		RevivalVirtualGridX: revivalVirtualGridX,
+		RevivalVirtualGridY: revivalVirtualGridY,
 	})
 }
 

udp_server_prac/main.go

@@ -0,0 +1,39 @@
+package main
+
+import (
+	"fmt"
+	"net"
+	"strings"
+)
+
+func main() {
+	conn, err := net.ListenUDP("udp", &net.UDPAddr{
+		Port: 3000,
+		IP:   net.ParseIP("0.0.0.0"),
+	})
+	if err != nil {
+		panic(err)
+	}
+
+	defer conn.Close()
+	fmt.Printf("server listening %s\n", conn.LocalAddr().String())
+
+	for {
+		message := make([]byte, 2046)
+		rlen, remote, err := conn.ReadFromUDP(message[:])
+		if err != nil {
+			panic(err)
+		}
+
+		data := strings.TrimSpace(string(message[:rlen]))
+		fmt.Printf("received: %d bytes, content=%s from %s\n", rlen, data, remote)
+
+		// echo
+		rlen, wrerr := conn.WriteTo(message[0:rlen], remote)
+		if wrerr != nil {
+			fmt.Printf("net.WriteTo() error: %s\n", wrerr)
+		} else {
+			fmt.Printf("Wrote %d bytes to socket\n", rlen)
+		}
+	}
+}