Updated documentation.

.gitignore

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

ConcerningEdgeCases.md

@@ -67,3 +67,12 @@ To summarize, if UDP is used we need
 
 ## Additional hassles to care about using UDP
 When using UDP, it's also necessary to verify authorization of each incoming packet, e.g. by simple time limited symmetric key, due to being connectionless.
+
+## Why not hybrid?
+Instead of replacing all use of TCP by UDP, it's more reasonable to keep using TCP for login and the "all-confirmed downsync inputFrames" from server to players (and possibly "upsync inputFrames" from player to server, but tradeoff on that remains to be discussed), while using a `UDP secondary session` for broadcasting inputFrames of each individual player asap (either using p2p or not) just for **better prediction performance**!
+
+## How do you actually implement the `UDP secondary session`?
+It's not a global consensus, but in practice many UDP communications are platform specific due to their paired asynchronous I/O choices, e.g. epoll in Linux and kqueue in BSD-ish. Of course there're many 3rd party higher level encapsulated tools for cross-platform use but that introduces extra debugging when things go wrong.
+
+Therefore, the following plan doesn't assume use of any specific 3rd party encapsulation of UDP communication.
+![UDP_secondary_session](./charts/UDPEssentials.jpg)

README.md

@@ -1,14 +1,21 @@
 # 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 [this demo video](https://pan.baidu.com/s/1ML6hNupaPHPJRd5rcTvQvw?pwd=8ruc) to see how this demo carries out a full 60fps synchronization with the help of _batched input upsync/downsync_ for satisfying network I/O performance.
+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.
+- 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 a [Phone-4G v.s. PC-Wifi (viewed by PC side)](https://pan.baidu.com/s/1wdUTvRiyrTLWy7mF6G7uyQ?pwd=icmp). 
+- Browser vs `native app` is possible but in that case only websocket is used.
+
+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) 
+
+to see how this demo carries out a full 60fps synchronization with the help of _batched input upsync/downsync_ for satisfying network I/O performance.
 
 ![gif_demo_1](./charts/internet_fireball_explosion_wallmove_spedup.gif)
 
-![gif_demo_2](./charts/jump_sync_spedup.gif)
-
-All gifs are sped up to ~1.5x for file size reduction, kindly note that animations are resumed from a partial progress!
+![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)
@@ -67,7 +74,7 @@ user@proj-root/battle_srv/configs> cp -r ./configs.template ./configs
 user@proj-root/frontend/assets/plugin_scripts> cp ./conf.js.template ./conf.js
 ```
 
-## 1.2 Actual building & running
+## 1.3 Actual building & running
 ### Backend 
 ```
 ### The following command runs mysql-server in foreground, it's almost NEVER run in such a way, please find a proper way to run it for yourself
@@ -96,3 +103,48 @@ ErrFatal        {"err": "MISCONF Redis is configured to save RDB snapshots, but
 ```
 
 Just restart your `redis-server` process.
+
+### 2.2 Why not show "PING value" on frontend display? 
+The most important reason for not showing "PING value" is simple: in most games the "PING value" is collected by a dedicated kernel thread which doesn't interfere the UI thread or the primary networking thread. As this demo primarily runs on browser by far, I don't have this capability easily.
+
+Moreover, in practice I found that to spot sync anomalies, the following tools are much more useful than the "PING VALUE".  
+- Detection of [prediction mismatch on the frontend](https://github.com/genxium/DelayNoMore/blob/v0.9.19/frontend/assets/scripts/Map.js#L842).
+- Detection of [type#1 forceConfirmation on the backend](https://github.com/genxium/DelayNoMore/blob/v0.9.19/battle_srv/models/room.go#L1246).
+- 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)
+
+### 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)
@@ -89,6 +92,7 @@ func setRouter(router *gin.Engine) {
 	router.StaticFS("/asset", http.Dir(filepath.Join(Conf.General.AppRoot, "asset")))
 	router.GET("/ping", f)
 	router.GET("/tsrht", ws.Serve)
+	router.GET("/tsrhtSecondary", ws.HandleSecondaryWsSessionForPlayer)
 
 	apiRouter := router.Group("/api")
 	{
@@ -113,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

@@ -41,6 +41,7 @@ func toPbRoomDownsyncFrame(rdf *battle.RoomDownsyncFrame) *pb.RoomDownsyncFrame
 			OnWall:            last.OnWall,
 			OnWallNormX:       last.OnWallNormX,
 			OnWallNormY:       last.OnWallNormY,
+			CapturedByInertia: last.CapturedByInertia,
 			JoinIndex:         last.JoinIndex,
 			BulletTeamId:      last.BulletTeamId,
 			ChCollisionTeamId: last.ChCollisionTeamId,
@@ -165,6 +166,7 @@ func toPbPlayers(modelInstances map[int32]*Player, withMetaInfo bool) []*pb.Play
 			OnWall:            last.OnWall,
 			OnWallNormX:       last.OnWallNormX,
 			OnWallNormY:       last.OnWallNormY,
+			CapturedByInertia: last.CapturedByInertia,
 			JoinIndex:         last.JoinIndex,
 			BulletTeamId:      last.BulletTeamId,
 			ChCollisionTeamId: last.ChCollisionTeamId,
@@ -216,6 +218,7 @@ func toJsPlayers(modelInstances map[int32]*Player) []*battle.PlayerDownsync {
 			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 {
@@ -50,6 +51,10 @@ type Player struct {
 	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"
@@ -27,10 +28,12 @@ const (
 	UPSYNC_MSG_ACT_PLAYER_CMD          = int32(2)
 	UPSYNC_MSG_ACT_PLAYER_COLLIDER_ACK = int32(3)
 
-	DOWNSYNC_MSG_ACT_HB_REQ         = int32(1)
-	DOWNSYNC_MSG_ACT_INPUT_BATCH    = int32(2)
-	DOWNSYNC_MSG_ACT_BATTLE_STOPPED = int32(3)
-	DOWNSYNC_MSG_ACT_FORCED_RESYNC  = int32(4)
+	DOWNSYNC_MSG_ACT_HB_REQ           = int32(1)
+	DOWNSYNC_MSG_ACT_INPUT_BATCH      = int32(2)
+	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)
@@ -116,10 +119,15 @@ type Room struct {
 	     *
 	     * Moreover, during the invocation of `PlayerSignalToCloseDict`, the `Player` instance is supposed to be deallocated (though not synchronously).
 	*/
-	PlayerDownsyncSessionDict              map[int32]*websocket.Conn
-	PlayerDownsyncChanDict                 map[int32](chan pb.InputsBufferSnapshot)
+	PlayerDownsyncSessionDict map[int32]*websocket.Conn
+	PlayerSignalToCloseDict   map[int32]SignalToCloseConnCbType
+	PlayerDownsyncChanDict    map[int32](chan pb.InputsBufferSnapshot)
+
+	PlayerSecondaryDownsyncSessionDict map[int32]*websocket.Conn
+	PlayerSecondarySignalToCloseDict   map[int32]SignalToCloseConnCbType
+	PlayerSecondaryDownsyncChanDict    map[int32](chan pb.InputsBufferSnapshot)
+
 	PlayerActiveWatchdogDict               map[int32](*Watchdog)
-	PlayerSignalToCloseDict                map[int32]SignalToCloseConnCbType
 	Score                                  float32
 	State                                  int32
 	Index                                  int
@@ -150,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() {
@@ -170,6 +182,9 @@ 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
@@ -184,7 +199,7 @@ func (pR *Room) AddPlayerIfPossible(pPlayerFromDbInit *Player, session *websocke
 	pR.PlayerSignalToCloseDict[playerId] = signalToCloseConnOfThisPlayer
 	newWatchdog := NewWatchdog(ConstVals.Ws.WillKickIfInactiveFor, func() {
 		Logger.Warn("Conn inactive watchdog triggered#1:", zap.Any("playerId", playerId), zap.Any("roomId", pR.Id), zap.Any("roomState", pR.State), zap.Any("roomEffectivePlayerCount", pR.EffectivePlayerCount))
-		signalToCloseConnOfThisPlayer(Constants.RetCode.ActiveWatchdog, "")
+		pR.signalToCloseAllSessionsOfPlayer(playerId, Constants.RetCode.ActiveWatchdog)
 	})
 	newWatchdog.Stop()
 	pR.PlayerActiveWatchdogDict[playerId] = newWatchdog
@@ -209,6 +224,9 @@ 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
@@ -221,7 +239,7 @@ func (pR *Room) ReAddPlayerIfPossible(pTmpPlayerInstance *Player, session *webso
 	pR.PlayerSignalToCloseDict[playerId] = signalToCloseConnOfThisPlayer
 	pR.PlayerActiveWatchdogDict[playerId] = NewWatchdog(ConstVals.Ws.WillKickIfInactiveFor, func() {
 		Logger.Warn("Conn inactive watchdog triggered#2:", zap.Any("playerId", playerId), zap.Any("roomId", pR.Id), zap.Any("roomState", pR.State), zap.Any("roomEffectivePlayerCount", pR.EffectivePlayerCount))
-		signalToCloseConnOfThisPlayer(Constants.RetCode.ActiveWatchdog, "")
+		pR.signalToCloseAllSessionsOfPlayer(playerId, Constants.RetCode.ActiveWatchdog)
 	}) // For ReAdded player the new watchdog starts immediately
 
 	Logger.Warn("ReAddPlayerIfPossible finished.", zap.Any("roomId", pR.Id), zap.Any("playerId", playerId), zap.Any("joinIndex", pEffectiveInRoomPlayerInstance.JoinIndex), zap.Any("playerBattleState", pEffectiveInRoomPlayerInstance.BattleState), zap.Any("roomState", pR.State), zap.Any("roomEffectivePlayerCount", pR.EffectivePlayerCount), zap.Any("AckingFrameId", pEffectiveInRoomPlayerInstance.AckingFrameId), zap.Any("AckingInputFrameId", pEffectiveInRoomPlayerInstance.AckingInputFrameId), zap.Any("LastSentInputFrameId", pEffectiveInRoomPlayerInstance.LastSentInputFrameId))
@@ -309,8 +327,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)
@@ -482,7 +500,7 @@ func (pR *Room) StartBattle() {
 						kickoffFrameJs := pR.RenderFrameBuffer.GetByFrameId(0).(*battle.RoomDownsyncFrame)
 						pbKickOffRenderFrame := toPbRoomDownsyncFrame(kickoffFrameJs)
 						pbKickOffRenderFrame.SpeciesIdList = pR.SpeciesIdList
-						pR.sendSafely(pbKickOffRenderFrame, nil, DOWNSYNC_MSG_ACT_BATTLE_START, playerId, true)
+						pR.sendSafely(pbKickOffRenderFrame, nil, DOWNSYNC_MSG_ACT_BATTLE_START, playerId, true, MAGIC_JOIN_INDEX_DEFAULT)
 					}
 					Logger.Info(fmt.Sprintf("In `battleMainLoop` for roomId=%v sent out kickoffFrame", pR.Id))
 				}
@@ -509,7 +527,7 @@ func (pR *Room) StartBattle() {
 		}
 	}
 
-	downsyncLoop := func(playerId int32, player *Player, playerDownsyncChan chan pb.InputsBufferSnapshot) {
+	downsyncLoop := func(playerId int32, player *Player, playerDownsyncChan chan pb.InputsBufferSnapshot, playerSecondaryDownsyncChan chan pb.InputsBufferSnapshot) {
 		defer func() {
 			if r := recover(); r != nil {
 				Logger.Error("downsyncLoop, recovery spot#1, recovered from: ", zap.Any("roomId", pR.Id), zap.Any("playerId", playerId), zap.Any("panic", r))
@@ -517,19 +535,23 @@ func (pR *Room) StartBattle() {
 			Logger.Info(fmt.Sprintf("The `downsyncLoop` for (roomId=%v, playerId=%v) is stopped@renderFrameId=%v", pR.Id, playerId, pR.RenderFrameId))
 		}()
 
-		Logger.Debug(fmt.Sprintf("Started downsyncLoop for (roomId: %d, playerId:%d, playerDownsyncChan:%p)", pR.Id, playerId, playerDownsyncChan))
+		//Logger.Info(fmt.Sprintf("Started downsyncLoop for (roomId: %d, playerId:%d, playerDownsyncChan:%p)", pR.Id, playerId, playerDownsyncChan))
 
 		for {
+			nowBattleState := atomic.LoadInt32(&pR.State)
+			switch nowBattleState {
+			case RoomBattleStateIns.IDLE, RoomBattleStateIns.STOPPING_BATTLE_FOR_SETTLEMENT, RoomBattleStateIns.IN_SETTLEMENT, RoomBattleStateIns.IN_DISMISSAL:
+				Logger.Warn(fmt.Sprintf("Battle is not waiting/preparing/active for playerDownsyncChan for (roomId: %d, playerId:%d)", pR.Id, playerId))
+				return
+			}
+
 			select {
 			case inputsBufferSnapshot := <-playerDownsyncChan:
-				nowBattleState := atomic.LoadInt32(&pR.State)
-				switch nowBattleState {
-				case RoomBattleStateIns.IDLE, RoomBattleStateIns.STOPPING_BATTLE_FOR_SETTLEMENT, RoomBattleStateIns.IN_SETTLEMENT, RoomBattleStateIns.IN_DISMISSAL:
-					Logger.Warn(fmt.Sprintf("Battle is not waiting/preparing/active for playerDownsyncChan for (roomId: %d, playerId:%d)", pR.Id, playerId))
-					return
-				}
 				pR.downsyncToSinglePlayer(playerId, player, inputsBufferSnapshot.RefRenderFrameId, inputsBufferSnapshot.UnconfirmedMask, inputsBufferSnapshot.ToSendInputFrameDownsyncs, inputsBufferSnapshot.ShouldForceResync)
 				//Logger.Info(fmt.Sprintf("Sent inputsBufferSnapshot(refRenderFrameId:%d, unconfirmedMask:%v) to for (roomId: %d, playerId:%d)#2", inputsBufferSnapshot.RefRenderFrameId, inputsBufferSnapshot.UnconfirmedMask, pR.Id, playerId))
+			case inputsBufferSnapshot2 := <-playerSecondaryDownsyncChan:
+				pR.downsyncPeerInputFrameUpsyncToSinglePlayer(playerId, player, inputsBufferSnapshot2.ToSendInputFrameDownsyncs, inputsBufferSnapshot2.PeerJoinIndex)
+				//Logger.Info(fmt.Sprintf("Sent secondary inputsBufferSnapshot to for (roomId: %d, playerId:%d)#2", pR.Id, playerId))
 			default:
 			}
 		}
@@ -542,7 +564,8 @@ func (pR *Room) StartBattle() {
 		   Each "playerDownsyncChan" stays alive through out the lifecycle of room instead of each "playerDownsyncSession", i.e. not closed or dereferenced upon disconnection.
 		*/
 		pR.PlayerDownsyncChanDict[playerId] = make(chan pb.InputsBufferSnapshot, pR.InputsBuffer.N)
-		go downsyncLoop(playerId, player, pR.PlayerDownsyncChanDict[playerId])
+		pR.PlayerSecondaryDownsyncChanDict[playerId] = make(chan pb.InputsBufferSnapshot, pR.InputsBuffer.N)
+		go downsyncLoop(playerId, player, pR.PlayerDownsyncChanDict[playerId], pR.PlayerSecondaryDownsyncChanDict[playerId])
 	}
 
 	pR.onBattlePrepare(func() {
@@ -599,7 +622,18 @@ func (pR *Room) OnBattleCmdReceived(pReq *pb.WsReq) {
 	inputsBufferSnapshot := pR.markConfirmationIfApplicable(inputFrameUpsyncBatch, playerId, player)
 	if nil != inputsBufferSnapshot {
 		pR.downsyncToAllPlayers(inputsBufferSnapshot)
-	}
+	} /*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)
+		}*/
 }
 
 func (pR *Room) onInputFrameDownsyncAllConfirmed(inputFrameDownsync *battle.InputFrameDownsync, playerId int32) {
@@ -641,6 +675,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++
@@ -650,7 +688,7 @@ func (pR *Room) StopBattleForSettlement() {
 			PlayersArr:     toPbPlayers(pR.Players, false),
 			CountdownNanos: -1, // TODO: Replace this magic constant!
 		}
-		pR.sendSafely(&assembledFrame, nil, DOWNSYNC_MSG_ACT_BATTLE_STOPPED, playerId, true)
+		pR.sendSafely(&assembledFrame, nil, DOWNSYNC_MSG_ACT_BATTLE_STOPPED, playerId, true, MAGIC_JOIN_INDEX_DEFAULT)
 	}
 	// Note that `pR.onBattleStoppedForSettlement` will be called by `battleMainLoop`.
 }
@@ -679,7 +717,7 @@ func (pR *Room) onBattlePrepare(cb BattleStartCbType) {
 
 	Logger.Info("Sending out frame for RoomBattleState.PREPARE:", zap.Any("battleReadyToStartFrame", battleReadyToStartFrame))
 	for _, player := range pR.Players {
-		pR.sendSafely(battleReadyToStartFrame, nil, DOWNSYNC_MSG_ACT_BATTLE_READY_TO_START, player.Id, true)
+		pR.sendSafely(battleReadyToStartFrame, nil, DOWNSYNC_MSG_ACT_BATTLE_READY_TO_START, player.Id, true, MAGIC_JOIN_INDEX_DEFAULT)
 	}
 
 	battlePreparationNanos := int64(6000000000)
@@ -748,6 +786,7 @@ func (pR *Room) OnDismissed() {
 	pR.CharacterConfigsArr = make([]*battle.CharacterConfig, pR.Capacity)
 	pR.CollisionSysMap = make(map[int32]*resolv.Object)
 	pR.PlayerDownsyncSessionDict = make(map[int32]*websocket.Conn)
+	pR.PlayerSecondaryDownsyncSessionDict = make(map[int32]*websocket.Conn)
 	for _, oldWatchdog := range pR.PlayerActiveWatchdogDict {
 		oldWatchdog.Stop()
 	}
@@ -756,7 +795,12 @@ func (pR *Room) OnDismissed() {
 		close(oldChan)
 	}
 	pR.PlayerDownsyncChanDict = make(map[int32](chan pb.InputsBufferSnapshot))
+	for _, oldChan := range pR.PlayerSecondaryDownsyncChanDict {
+		close(oldChan)
+	}
+	pR.PlayerSecondaryDownsyncChanDict = make(map[int32](chan pb.InputsBufferSnapshot))
 	pR.PlayerSignalToCloseDict = make(map[int32]SignalToCloseConnCbType)
+	pR.PlayerSecondarySignalToCloseDict = make(map[int32]SignalToCloseConnCbType)
 	pR.JoinIndexBooleanArr = make([]bool, pR.Capacity)
 	pR.RenderCacheSize = 1024
 	pR.RenderFrameBuffer = battle.NewRingBuffer(pR.RenderCacheSize)
@@ -781,37 +825,47 @@ func (pR *Room) OnDismissed() {
 	pR.BattleDurationFrames = int32(60 * 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 = 12                                                        // 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))
 }
 
 func (pR *Room) expelPlayerDuringGame(playerId int32) {
-	if signalToCloseConnOfThisPlayer, existent := pR.PlayerSignalToCloseDict[playerId]; existent {
-		signalToCloseConnOfThisPlayer(Constants.RetCode.UnknownError, "") // TODO: Specify an error code
-	}
+	pR.signalToCloseAllSessionsOfPlayer(playerId, Constants.RetCode.UnknownError)
 	pR.onPlayerExpelledDuringGame(playerId)
 }
 
 func (pR *Room) expelPlayerForDismissal(playerId int32) {
-	if signalToCloseConnOfThisPlayer, existent := pR.PlayerSignalToCloseDict[playerId]; existent {
-		signalToCloseConnOfThisPlayer(Constants.RetCode.UnknownError, "") // TODO: Specify an error code
-	}
+	pR.signalToCloseAllSessionsOfPlayer(playerId, Constants.RetCode.UnknownError)
 	pR.onPlayerExpelledForDismissal(playerId)
 }
 
+func (pR *Room) signalToCloseAllSessionsOfPlayer(playerId int32, retCode int) {
+	if signalToCloseConnOfThisPlayer, existent := pR.PlayerSignalToCloseDict[playerId]; existent {
+		signalToCloseConnOfThisPlayer(retCode, "") // TODO: Specify an error code
+	}
+	if signalToCloseConnOfThisPlayer2, existent2 := pR.PlayerSecondarySignalToCloseDict[playerId]; existent2 {
+		signalToCloseConnOfThisPlayer2(retCode, "") // TODO: Specify an error code
+	}
+}
+
 func (pR *Room) onPlayerExpelledDuringGame(playerId int32) {
 	pR.onPlayerLost(playerId)
 }
@@ -829,6 +883,10 @@ func (pR *Room) OnPlayerDisconnected(playerId int32) {
 		}
 	}()
 
+	if signalToCloseConnOfThisPlayer2, existent2 := pR.PlayerSecondarySignalToCloseDict[playerId]; existent2 {
+		signalToCloseConnOfThisPlayer2(Constants.RetCode.UnknownError, "") // TODO: Specify an error code
+	}
+
 	if player, existent := pR.Players[playerId]; existent {
 		thatPlayerBattleState := atomic.LoadInt32(&(player.BattleState))
 		switch thatPlayerBattleState {
@@ -888,6 +946,8 @@ func (pR *Room) clearPlayerNetworkSession(playerId int32) {
 		delete(pR.PlayerActiveWatchdogDict, playerId)
 		delete(pR.PlayerDownsyncSessionDict, playerId)
 		delete(pR.PlayerSignalToCloseDict, playerId)
+		delete(pR.PlayerSecondaryDownsyncSessionDict, playerId)
+		delete(pR.PlayerSecondarySignalToCloseDict, playerId)
 	}
 }
 
@@ -977,7 +1037,7 @@ func (pR *Room) OnPlayerBattleColliderAcked(playerId int32) bool {
 			Logger.Debug(fmt.Sprintf("OnPlayerBattleColliderAcked-middle: roomId=%v, roomState=%v, targetPlayerId=%v, targetPlayerBattleState=%v, thatPlayerId=%v, thatPlayerBattleState=%v", pR.Id, pR.State, targetPlayer.Id, targetPlayer.BattleState, thatPlayer.Id, thatPlayerBattleState))
 			if thatPlayerId == targetPlayer.Id || (PlayerBattleStateIns.ADDED_PENDING_BATTLE_COLLIDER_ACK == thatPlayerBattleState || PlayerBattleStateIns.ACTIVE == thatPlayerBattleState) {
 				Logger.Debug(fmt.Sprintf("OnPlayerBattleColliderAcked-sending DOWNSYNC_MSG_ACT_PLAYER_ADDED_AND_ACKED: roomId=%v, roomState=%v, targetPlayerId=%v, targetPlayerBattleState=%v, capacity=%v, EffectivePlayerCount=%v", pR.Id, pR.State, targetPlayer.Id, targetPlayer.BattleState, pR.Capacity, pR.EffectivePlayerCount))
-				pR.sendSafely(playerAckedFrame, nil, DOWNSYNC_MSG_ACT_PLAYER_ADDED_AND_ACKED, thatPlayer.Id, true)
+				pR.sendSafely(playerAckedFrame, nil, DOWNSYNC_MSG_ACT_PLAYER_ADDED_AND_ACKED, thatPlayer.Id, true, MAGIC_JOIN_INDEX_DEFAULT)
 			}
 		}
 		atomic.StoreInt32(&(targetPlayer.BattleState), PlayerBattleStateIns.ACTIVE)
@@ -1010,28 +1070,45 @@ func (pR *Room) OnPlayerBattleColliderAcked(playerId int32) bool {
 	return true
 }
 
-func (pR *Room) sendSafely(roomDownsyncFrame *pb.RoomDownsyncFrame, toSendInputFrameDownsyncs []*pb.InputFrameDownsync, act int32, playerId int32, needLockExplicitly bool) {
+func (pR *Room) sendSafely(roomDownsyncFrame *pb.RoomDownsyncFrame, toSendInputFrameDownsyncs []*pb.InputFrameDownsync, act int32, playerId int32, needLockExplicitly bool, peerJoinIndex int32) {
 	defer func() {
 		if r := recover(); r != nil {
 			Logger.Error("sendSafely, recovered from: ", zap.Any("roomId", pR.Id), zap.Any("playerId", playerId), zap.Any("panic", r))
 		}
 	}()
 
-	if playerDownsyncSession, existent := pR.PlayerDownsyncSessionDict[playerId]; existent {
-		pResp := &pb.WsResp{
-			Ret:                     int32(Constants.RetCode.Ok),
-			Act:                     act,
-			Rdf:                     roomDownsyncFrame,
-			InputFrameDownsyncBatch: toSendInputFrameDownsyncs,
-		}
+	pResp := &pb.WsResp{
+		Ret:                     int32(Constants.RetCode.Ok),
+		Act:                     act,
+		Rdf:                     roomDownsyncFrame,
+		InputFrameDownsyncBatch: toSendInputFrameDownsyncs,
+		PeerJoinIndex:           peerJoinIndex,
+	}
 
-		theBytes, marshalErr := proto.Marshal(pResp)
-		if nil != marshalErr {
-			panic(fmt.Sprintf("Error marshaling downsync message: roomId=%v, playerId=%v, roomState=%v, roomEffectivePlayerCount=%v", pR.Id, playerId, pR.State, pR.EffectivePlayerCount))
-		}
+	theBytes, marshalErr := proto.Marshal(pResp)
+	if nil != marshalErr {
+		panic(fmt.Sprintf("Error marshaling downsync message: roomId=%v, playerId=%v, roomState=%v, roomEffectivePlayerCount=%v", pR.Id, playerId, pR.State, pR.EffectivePlayerCount))
+	}
 
-		if err := playerDownsyncSession.WriteMessage(websocket.BinaryMessage, theBytes); nil != err {
-			panic(fmt.Sprintf("Error sending downsync message: roomId=%v, playerId=%v, roomState=%v, roomEffectivePlayerCount=%v, err=%v", pR.Id, playerId, pR.State, pR.EffectivePlayerCount, err))
+	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))
+			}
+		}
+	} else {
+		/*
+		   [FIXME]
+		   This branch is preferred to use an additional session of each player for sending, and the session is preferrably UDP instead of any TCP-based protocol, but I'm being lazy here.
+
+		   See `<proj-root>/ConcerningEdgeCases.md` for the advantage of using UDP as a supplement.
+		*/
+		if playerSecondaryDownsyncSession, existent := pR.PlayerSecondaryDownsyncSessionDict[playerId]; existent {
+			if err := playerSecondaryDownsyncSession.WriteMessage(websocket.BinaryMessage, theBytes); nil != err {
+				panic(fmt.Sprintf("Error sending secondary downsync message: roomId=%v, playerId=%v, roomState=%v, roomEffectivePlayerCount=%v, err=%v", pR.Id, playerId, pR.State, pR.EffectivePlayerCount, err))
+			}
 		}
 	}
 }
@@ -1297,13 +1374,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 {
@@ -1347,6 +1424,30 @@ func (pR *Room) doBattleMainLoopPerTickBackendDynamicsWithProperLocking(prevRend
 	}
 }
 
+func (pR *Room) broadcastPeerUpsyncForBetterPrediction(inputsBufferSnapshot *pb.InputsBufferSnapshot) {
+	// See `<proj-root>/ConcerningEdgeCases.md` for why this method exists.
+	for _, player := range pR.PlayersArr {
+		playerBattleState := atomic.LoadInt32(&(player.BattleState))
+		switch playerBattleState {
+		case PlayerBattleStateIns.DISCONNECTED, PlayerBattleStateIns.LOST, PlayerBattleStateIns.EXPELLED_DURING_GAME, PlayerBattleStateIns.EXPELLED_IN_DISMISSAL, PlayerBattleStateIns.ADDED_PENDING_BATTLE_COLLIDER_ACK, PlayerBattleStateIns.READDED_PENDING_BATTLE_COLLIDER_ACK:
+			continue
+		}
+		if player.JoinIndex == inputsBufferSnapshot.PeerJoinIndex {
+			continue
+		}
+
+		if playerSecondaryDownsyncChan, existent := pR.PlayerSecondaryDownsyncChanDict[player.Id]; existent {
+			/*
+			   [FIXME]
+			   This function is preferred to use an additional go-channel of each player for sending, see "downsyncLoop" & "Room.sendSafely" for more information!
+			*/
+			playerSecondaryDownsyncChan <- (*inputsBufferSnapshot)
+		} else {
+			Logger.Warn(fmt.Sprintf("playerDownsyncChan for (roomId: %d, playerId:%d) is gone", pR.Id, player.Id))
+		}
+	}
+}
+
 func (pR *Room) downsyncToAllPlayers(inputsBufferSnapshot *pb.InputsBufferSnapshot) {
 	/*
 		       [WARNING] This function MUST BE called while "pR.InputsBufferLock" is LOCKED to **preserve the order of generation of "inputsBufferSnapshot" for sending** -- see comments in "OnBattleCmdReceived" and [this issue](https://github.com/genxium/DelayNoMore/issues/12).
@@ -1423,14 +1524,14 @@ func (pR *Room) downsyncToSinglePlayer(playerId int32, player *Player, refRender
 	   We hereby assume that Golang runtime allocates & frees small amount of RAM quickly enough compared to either network I/O blocking in worst cases or the high frequency "per inputFrameDownsync*player" locking (though "OnBattleCmdReceived" locks at the same frequency but it's inevitable).
 	*/
 
-	playerJoinIndex := player.JoinIndex - 1
+	playerJoinIndexInBooleanArr := player.JoinIndex - 1
 	playerBattleState := atomic.LoadInt32(&(player.BattleState))
 	switch playerBattleState {
 	case PlayerBattleStateIns.DISCONNECTED, PlayerBattleStateIns.LOST, PlayerBattleStateIns.EXPELLED_DURING_GAME, PlayerBattleStateIns.EXPELLED_IN_DISMISSAL, PlayerBattleStateIns.ADDED_PENDING_BATTLE_COLLIDER_ACK, PlayerBattleStateIns.READDED_PENDING_BATTLE_COLLIDER_ACK:
 		return
 	}
 
-	isSlowTicker := (0 < (unconfirmedMask & uint64(1<<uint32(playerJoinIndex))))
+	isSlowTicker := (0 < (unconfirmedMask & uint64(1<<uint32(playerJoinIndexInBooleanArr))))
 	shouldResync1 := (PlayerBattleStateIns.READDED_BATTLE_COLLIDER_ACKED == playerBattleState) // i.e. implies that "MAGIC_LAST_SENT_INPUT_FRAME_ID_READDED == player.LastSentInputFrameId"
 	shouldResync2 := isSlowTicker                                                              // This condition is critical, if we don't send resync upon this condition, the "reconnected or slowly-clocking player" might never get its input synced
 	shouldResync3 := shouldForceResync
@@ -1455,13 +1556,13 @@ func (pR *Room) downsyncToSinglePlayer(playerId int32, player *Player, refRender
 		refRenderFrame.BackendUnconfirmedMask = unconfirmedMask
 		pbRefRenderFrame := toPbRoomDownsyncFrame(refRenderFrame)
 		pbRefRenderFrame.SpeciesIdList = pR.SpeciesIdList
-		pR.sendSafely(pbRefRenderFrame, toSendInputFrameDownsyncsSnapshot, DOWNSYNC_MSG_ACT_FORCED_RESYNC, playerId, false)
+		pR.sendSafely(pbRefRenderFrame, toSendInputFrameDownsyncsSnapshot, DOWNSYNC_MSG_ACT_FORCED_RESYNC, playerId, false, MAGIC_JOIN_INDEX_DEFAULT)
 		//Logger.Warn(fmt.Sprintf("Sent refRenderFrameId=%v & inputFrameIds [%d, %d), for roomId=%v, playerId=%d, playerJoinIndex=%d, renderFrameId=%d, curDynamicsRenderFrameId=%d, playerLastSentInputFrameId=%d: InputsBuffer=%v", refRenderFrameId, toSendInputFrameIdSt, toSendInputFrameIdEd, pR.Id, playerId, player.JoinIndex, pR.RenderFrameId, pR.CurDynamicsRenderFrameId, player.LastSentInputFrameId, pR.InputsBufferString(false)))
 		if shouldResync1 || shouldResync3 {
 			Logger.Debug(fmt.Sprintf("Sent refRenderFrameId=%v & inputFrameIds [%d, %d), for roomId=%v, playerId=%d, playerJoinIndex=%d, renderFrameId=%d, curDynamicsRenderFrameId=%d, playerLastSentInputFrameId=%d: shouldResync1=%v, shouldResync2=%v, shouldResync3=%v, playerBattleState=%d", refRenderFrameId, toSendInputFrameIdSt, toSendInputFrameIdEd, pR.Id, playerId, player.JoinIndex, pR.RenderFrameId, pR.CurDynamicsRenderFrameId, player.LastSentInputFrameId, shouldResync1, shouldResync2, shouldResync3, playerBattleState))
 		}
 	} else {
-		pR.sendSafely(nil, toSendInputFrameDownsyncsSnapshot, DOWNSYNC_MSG_ACT_INPUT_BATCH, playerId, false)
+		pR.sendSafely(nil, toSendInputFrameDownsyncsSnapshot, DOWNSYNC_MSG_ACT_INPUT_BATCH, playerId, false, MAGIC_JOIN_INDEX_DEFAULT)
 	}
 	player.LastSentInputFrameId = toSendInputFrameIdEd - 1
 	if shouldResync1 {
@@ -1469,6 +1570,16 @@ func (pR *Room) downsyncToSinglePlayer(playerId int32, player *Player, refRender
 	}
 }
 
+func (pR *Room) downsyncPeerInputFrameUpsyncToSinglePlayer(playerId int32, player *Player, toSendInputFrameDownsyncsSnapshot []*pb.InputFrameDownsync, peerJoinIndex int32) {
+	playerBattleState := atomic.LoadInt32(&(player.BattleState))
+	switch playerBattleState {
+	case PlayerBattleStateIns.DISCONNECTED, PlayerBattleStateIns.LOST, PlayerBattleStateIns.EXPELLED_DURING_GAME, PlayerBattleStateIns.EXPELLED_IN_DISMISSAL, PlayerBattleStateIns.ADDED_PENDING_BATTLE_COLLIDER_ACK, PlayerBattleStateIns.READDED_PENDING_BATTLE_COLLIDER_ACK:
+		return
+	}
+
+	pR.sendSafely(nil, toSendInputFrameDownsyncsSnapshot, DOWNSYNC_MSG_ACT_PEER_INPUT_BATCH, playerId, false, peerJoinIndex)
+}
+
 func (pR *Room) cloneInputsBuffer(stFrameId, edFrameId int32) []*pb.InputFrameDownsync {
 	// [WARNING] This function MUST BE called while "pR.InputsBufferLock" is locked!
 	cloned := make([]*pb.InputFrameDownsync, 0, edFrameId-stFrameId)
@@ -1501,3 +1612,163 @@ func (pR *Room) cloneInputsBuffer(stFrameId, edFrameId int32) []*pb.InputFrameDo
 
 	return cloned
 }
+
+func (pR *Room) SetSecondarySession(playerId int32, session *websocket.Conn, signalToCloseConnOfThisPlayer SignalToCloseConnCbType) {
+	// TODO: Use a dedicated lock
+	if player, ok := pR.Players[playerId]; ok {
+		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 {
+			if _, existent2 := pR.PlayerSecondaryDownsyncSessionDict[playerId]; !existent2 {
+				Logger.Info(fmt.Sprintf("SetSecondarySession for roomId=%v, playerId=%d, pR.Players=%v", pR.Id, playerId, pR.Players))
+				pR.PlayerSecondaryDownsyncSessionDict[playerId] = session
+				pR.PlayerSecondarySignalToCloseDict[playerId] = signalToCloseConnOfThisPlayer
+			}
+		}
+	}
+}
+
+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("`BattleUdpTunnel` for roomId=%d failed to unmarshal", 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) // To help advance "pR.LastAllConfirmedInputFrameId" asap
+					}
+
+				}
+			} 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"
@@ -46,6 +47,7 @@ func Serve(c *gin.Context) {
 		c.AbortWithStatus(http.StatusBadRequest)
 		return
 	}
+
 	boundRoomId := 0
 	expectedRoomId := 0
 	var err error
@@ -255,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))
@@ -395,3 +405,118 @@ func Serve(c *gin.Context) {
 	startOrFeedHeartbeatWatchdog(conn)
 	go receivingLoopAgainstPlayer()
 }
+
+func HandleSecondaryWsSessionForPlayer(c *gin.Context) {
+	token, ok := c.GetQuery("intAuthToken")
+	if !ok {
+		Logger.Warn("Secondary ws session req must have intAuthToken param!")
+		c.AbortWithStatus(http.StatusBadRequest)
+		return
+	}
+
+	boundRoomId := 0
+	var err error = nil
+	if boundRoomIdStr, hasBoundRoomId := c.GetQuery("boundRoomId"); hasBoundRoomId {
+		boundRoomId, err = strconv.Atoi(boundRoomIdStr)
+		if err != nil {
+			c.AbortWithStatus(http.StatusBadRequest)
+			return
+		}
+	} else {
+		Logger.Warn("Secondary ws session req must have boundRoomId param:", zap.Any("intAuthToken", token))
+		c.AbortWithStatus(http.StatusBadRequest)
+		return
+	}
+
+	var pRoom *models.Room = nil
+	// Deliberately querying playerId after querying room, because the former is against persistent storage and could be slow!
+	if tmpPRoom, existent := (*models.RoomMapManagerIns)[int32(boundRoomId)]; !existent {
+		Logger.Warn("Secondary ws session failed to get:\n", zap.Any("intAuthToken", token), zap.Any("forBoundRoomId", boundRoomId))
+		c.AbortWithStatus(http.StatusBadRequest)
+	} else {
+		pRoom = tmpPRoom
+	}
+
+	// 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("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:", zap.Any("playerId", playerId), zap.Any("intAuthToken", token), zap.Any("boundRoomId", boundRoomId))
+
+	conn, err := upgrader.Upgrade(c.Writer, c.Request, nil)
+	if err != nil {
+		Logger.Error("Secondary ws session upgrade:", zap.Error(err), zap.Any("playerId", playerId))
+		c.AbortWithStatus(http.StatusBadRequest)
+		return
+	}
+
+	connHasBeenSignaledToClose := int32(0)
+	pConnHasBeenSignaledToClose := &connHasBeenSignaledToClose
+
+	signalToCloseConnOfThisPlayer := func(customRetCode int, customRetMsg string) {
+		if swapped := atomic.CompareAndSwapInt32(pConnHasBeenSignaledToClose, 0, 1); !swapped {
+			return
+		}
+		Logger.Warn("Secondary ws session signalToCloseConnOfThisPlayer:", zap.Any("playerId", playerId), zap.Any("customRetCode", customRetCode), zap.Any("customRetMsg", customRetMsg))
+		defer func() {
+			if r := recover(); r != nil {
+				Logger.Error("Secondary ws session recovered from: ", zap.Any("panic", r))
+			}
+		}()
+
+		closeMessage := websocket.FormatCloseMessage(customRetCode, customRetMsg)
+		err := conn.WriteControl(websocket.CloseMessage, closeMessage, time.Now().Add(time.Millisecond*(ConstVals.Ws.WillKickIfInactiveFor)))
+		if err != nil {
+			Logger.Error("Secondary ws session unable to send the CloseFrame control message to player(client-side):", zap.Any("playerId", playerId), zap.Error(err))
+		}
+
+		time.AfterFunc(3*time.Second, func() {
+			// To actually terminates the underlying TCP connection which might be in `CLOSE_WAIT` state if inspected by `netstat`.
+			conn.Close()
+		})
+	}
+
+	onReceivedCloseMessageFromClient := func(code int, text string) error {
+		Logger.Warn("Secondary ws session triggered `onReceivedCloseMessageFromClient`:", zap.Any("code", code), zap.Any("playerId", playerId), zap.Any("message", text))
+		signalToCloseConnOfThisPlayer(code, text)
+		return nil
+	}
+
+	conn.SetCloseHandler(onReceivedCloseMessageFromClient)
+
+	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/NetworkDoctor.js

@@ -1,66 +0,0 @@
-function NetworkDoctor(serverFps, clientUpsyncFps) {
-  this.serverFps = serverFps;
-  this.clientUpsyncFps = clientUpsyncFps;
-  this.millisPerServerFrame = parseInt(1000 / this.serverFps);
-  this._tooLongSinceLastFrameDiffReceivedThreshold = (this.millisPerServerFrame << 6);
-
-  this.setupFps = function(fps) {
-    this.serverFps = this.clientUpsyncFps = fps;
-    this.millisPerServerFrame = parseInt(1000 / this.serverFps);
-    this._tooLongSinceLastFrameDiffReceivedThreshold = (this.millisPerServerFrame << 6);
-  }
-
-  this._lastFrameDiffRecvTime = null;
-  this._tooLongSinceLastFrameDiffReceived = function() {
-    if (undefined === this._lastFrameDiffRecvTime || null === this._lastFrameDiffRecvTime) return false;
-    return (this._tooLongSinceLastFrameDiffReceivedThreshold <= (Date.now() - this._lastFrameDiffRecvTime));
-  };
-
-  this._consecutiveALittleLongFrameDiffReceivedIntervalCount = 0;
-  this._consecutiveALittleLongFrameDiffReceivedIntervalCountThreshold = 120;
-
-  this.onNewFrameDiffReceived = function(frameDiff) {
-    var now = Date.now();
-    if (undefined !== this._lastFrameDiffRecvTime && null !== this._lastFrameDiffRecvTime) {
-      var intervalFromLastFrameDiff = (now - this._lastFrameDiffRecvTime);
-      if ((this.millisPerServerFrame << 5) < intervalFromLastFrameDiff) {
-        ++this._consecutiveALittleLongFrameDiffReceivedIntervalCount;
-        console.log('Medium delay, intervalFromLastFrameDiff is', intervalFromLastFrameDiff);
-      } else {
-        this._consecutiveALittleLongFrameDiffReceivedIntervalCount = 0;
-      }
-    }
-    this._lastFrameDiffRecvTime = now;
-  };
-
-  this._networkComplaintPrefix = "\nNetwork is not good >_<\n";
-
-  this.generateNetworkComplaint = function(excludeTypeConstantALittleLongFrameDiffReceivedInterval, excludeTypeTooLongSinceLastFrameDiffReceived) {
-    if (this.hasBattleStopped) return null;
-    var shouldComplain = false;
-    var ret = this._networkComplaintPrefix;
-    if (true != excludeTypeConstantALittleLongFrameDiffReceivedInterval && this._consecutiveALittleLongFrameDiffReceivedIntervalCountThreshold <= this._consecutiveALittleLongFrameDiffReceivedIntervalCount) {
-      this._consecutiveALittleLongFrameDiffReceivedIntervalCount = 0;
-      ret += "\nConstantly having a little long recv interval.\n";
-      shouldComplain = true;
-    }
-    if (true != excludeTypeTooLongSinceLastFrameDiffReceived && this._tooLongSinceLastFrameDiffReceived()) {
-      ret += "\nToo long since last received frameDiff.\n";
-      shouldComplain = true;
-    }
-    return (shouldComplain ? ret : null);
-  };
-
-  this.hasBattleStopped = false;
-  this.onBattleStopped = function() {
-    this.hasBattleStopped = true;
-  };
-
-  this.isClientSessionConnected = function() {
-    if (!window.game) return false;
-    if (!window.game.clientSession) return false;
-    return window.game.clientSession.connected; 
-  };
-}
-
-window.NetworkDoctor = NetworkDoctor;

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/KnifeGirl/Atk2.anim

@@ -18,61 +18,43 @@
             }
           },
           {
-            "frame": 0.06666666666666667,
+            "frame": 0.05,
             "value": {
               "__uuid__": "dd9a00aa-ddbc-4b01-a7cb-3c43c3a655b6"
             }
           },
           {
-            "frame": 0.11666666666666667,
-            "value": {
-              "__uuid__": "f66e83bd-1afc-4957-bb16-488d70566ed1"
-            }
-          },
-          {
-            "frame": 0.16666666666666666,
-            "value": {
-              "__uuid__": "bd682c41-dc62-49ff-a96a-18b33e50a6de"
-            }
-          },
-          {
-            "frame": 0.23333333333333334,
-            "value": {
-              "__uuid__": "94ccab85-e32f-4e13-b0e5-72c798f78ad1"
-            }
-          },
-          {
-            "frame": 0.3,
+            "frame": 0.08333333333333333,
             "value": {
               "__uuid__": "e80d3a01-5048-42b7-a280-cb6aa01602c2"
             }
           },
           {
-            "frame": 0.36666666666666664,
+            "frame": 0.11666666666666667,
             "value": {
               "__uuid__": "d899088c-be62-47b4-9ebf-0a89a2261565"
             }
           },
           {
-            "frame": 0.4166666666666667,
+            "frame": 0.15,
             "value": {
               "__uuid__": "5b1e5aa7-fd82-47ae-a5b2-6d4983d848ed"
             }
           },
           {
-            "frame": 0.48333333333333334,
+            "frame": 0.18333333333333332,
             "value": {
               "__uuid__": "c2945988-b4bb-4583-a5ef-2fa02b23a347"
             }
           },
           {
-            "frame": 0.5666666666666667,
+            "frame": 0.23333333333333334,
             "value": {
               "__uuid__": "070ea1e3-9c07-4735-8b94-515ef70216ad"
             }
           },
           {
-            "frame": 0.6666666666666666,
+            "frame": 0.2833333333333333,
             "value": {
               "__uuid__": "3b8bc5c0-26df-4218-b7dc-134a36080a35"
             }

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

@@ -15,7 +15,7 @@
                 <key>spriteSourceSize</key>
                 <string>{112,128}</string>
                 <key>textureRect</key>
-                <string>{{806,750},{112,128}}</string>
+                <string>{{384,989},{112,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -30,7 +30,7 @@
                 <key>spriteSourceSize</key>
                 <string>{112,128}</string>
                 <key>textureRect</key>
-                <string>{{0,1076},{112,128}}</string>
+                <string>{{256,990},{112,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -60,7 +60,7 @@
                 <key>spriteSourceSize</key>
                 <string>{80,128}</string>
                 <key>textureRect</key>
-                <string>{{528,515},{80,128}}</string>
+                <string>{{940,0},{80,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -75,7 +75,7 @@
                 <key>spriteSourceSize</key>
                 <string>{80,128}</string>
                 <key>textureRect</key>
-                <string>{{934,640},{80,128}}</string>
+                <string>{{940,128},{80,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -90,7 +90,7 @@
                 <key>spriteSourceSize</key>
                 <string>{112,128}</string>
                 <key>textureRect</key>
-                <string>{{128,1076},{112,128}}</string>
+                <string>{{128,1082},{112,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -105,7 +105,7 @@
                 <key>spriteSourceSize</key>
                 <string>{112,128}</string>
                 <key>textureRect</key>
-                <string>{{678,862},{112,128}}</string>
+                <string>{{0,1188},{112,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -150,7 +150,7 @@
                 <key>spriteSourceSize</key>
                 <string>{80,128}</string>
                 <key>textureRect</key>
-                <string>{{934,768},{80,128}}</string>
+                <string>{{940,256},{80,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -165,7 +165,7 @@
                 <key>spriteSourceSize</key>
                 <string>{80,128}</string>
                 <key>textureRect</key>
-                <string>{{934,896},{80,128}}</string>
+                <string>{{937,384},{80,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -180,9 +180,9 @@
                 <key>spriteSourceSize</key>
                 <string>{80,128}</string>
                 <key>textureRect</key>
-                <string>{{806,958},{80,128}}</string>
+                <string>{{528,515},{80,128}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>Atk2_0.png</key>
             <dict>
@@ -195,7 +195,7 @@
                 <key>spriteSourceSize</key>
                 <string>{80,128}</string>
                 <key>textureRect</key>
-                <string>{{934,1024},{80,128}}</string>
+                <string>{{936,512},{80,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -225,7 +225,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,112}</string>
                 <key>textureRect</key>
-                <string>{{128,964},{128,112}}</string>
+                <string>{{0,1076},{128,112}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -240,7 +240,7 @@
                 <key>spriteSourceSize</key>
                 <string>{96,96}</string>
                 <key>textureRect</key>
-                <string>{{912,1152},{96,96}}</string>
+                <string>{{688,1357},{96,96}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -255,7 +255,7 @@
                 <key>spriteSourceSize</key>
                 <string>{96,112}</string>
                 <key>textureRect</key>
-                <string>{{340,1197},{96,112}}</string>
+                <string>{{240,1360},{96,112}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -270,7 +270,7 @@
                 <key>spriteSourceSize</key>
                 <string>{96,112}</string>
                 <key>textureRect</key>
-                <string>{{452,1196},{96,112}}</string>
+                <string>{{352,1358},{96,112}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -285,7 +285,7 @@
                 <key>spriteSourceSize</key>
                 <string>{96,112}</string>
                 <key>textureRect</key>
-                <string>{{564,1155},{96,112}}</string>
+                <string>{{920,1072},{96,112}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -300,7 +300,7 @@
                 <key>spriteSourceSize</key>
                 <string>{96,112}</string>
                 <key>textureRect</key>
-                <string>{{608,1043},{96,112}}</string>
+                <string>{{914,1184},{96,112}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -330,7 +330,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,112}</string>
                 <key>textureRect</key>
-                <string>{{678,750},{128,112}}</string>
+                <string>{{806,631},{128,112}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -540,7 +540,7 @@
                 <key>spriteSourceSize</key>
                 <string>{112,112}</string>
                 <key>textureRect</key>
-                <string>{{448,1293},{112,112}}</string>
+                <string>{{802,1149},{112,112}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -555,9 +555,9 @@
                 <key>spriteSourceSize</key>
                 <string>{96,112}</string>
                 <key>textureRect</key>
-                <string>{{660,1155},{96,112}}</string>
+                <string>{{800,1261},{96,112}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Atked1_3.png</key>
             <dict>
@@ -570,7 +570,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,112}</string>
                 <key>textureRect</key>
-                <string>{{384,988},{128,112}}</string>
+                <string>{{806,743},{128,112}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -645,7 +645,7 @@
                 <key>spriteSourceSize</key>
                 <string>{114,112}</string>
                 <key>textureRect</key>
-                <string>{{0,1188},{114,112}}</string>
+                <string>{{806,1037},{114,112}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -660,9 +660,9 @@
                 <key>spriteSourceSize</key>
                 <string>{114,112}</string>
                 <key>textureRect</key>
-                <string>{{114,1188},{114,112}}</string>
+                <string>{{384,1213},{114,112}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Dashing_3.png</key>
             <dict>
@@ -675,7 +675,7 @@
                 <key>spriteSourceSize</key>
                 <string>{114,112}</string>
                 <key>textureRect</key>
-                <string>{{0,1300},{114,112}}</string>
+                <string>{{464,1327},{114,112}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -690,7 +690,7 @@
                 <key>spriteSourceSize</key>
                 <string>{114,112}</string>
                 <key>textureRect</key>
-                <string>{{112,1300},{114,112}}</string>
+                <string>{{496,1213},{114,112}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -705,7 +705,7 @@
                 <key>spriteSourceSize</key>
                 <string>{114,112}</string>
                 <key>textureRect</key>
-                <string>{{0,1300},{114,112}}</string>
+                <string>{{464,1327},{114,112}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -720,7 +720,7 @@
                 <key>spriteSourceSize</key>
                 <string>{114,112}</string>
                 <key>textureRect</key>
-                <string>{{224,1300},{114,112}}</string>
+                <string>{{576,1327},{114,112}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -735,56 +735,11 @@
                 <key>spriteSourceSize</key>
                 <string>{114,112}</string>
                 <key>textureRect</key>
-                <string>{{336,1293},{114,112}}</string>
+                <string>{{688,1043},{114,112}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>GetUp1_1.png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{128,118}</string>
-                <key>spriteSourceSize</key>
-                <string>{128,118}</string>
-                <key>textureRect</key>
-                <string>{{384,634},{128,118}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>GetUp1_2.png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{128,118}</string>
-                <key>spriteSourceSize</key>
-                <string>{128,118}</string>
-                <key>textureRect</key>
-                <string>{{384,752},{128,118}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>GetUp1_3.png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{128,118}</string>
-                <key>spriteSourceSize</key>
-                <string>{128,118}</string>
-                <key>textureRect</key>
-                <string>{{256,753},{128,118}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>GetUp1_4.png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
@@ -799,7 +754,7 @@
                 <key>textureRotated</key>
                 <false/>
             </dict>
-            <key>GetUp1_5.png</key>
+            <key>GetUp1_2.png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
@@ -814,6 +769,51 @@
                 <key>textureRotated</key>
                 <false/>
             </dict>
+            <key>GetUp1_3.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{128,118}</string>
+                <key>spriteSourceSize</key>
+                <string>{128,118}</string>
+                <key>textureRect</key>
+                <string>{{384,753},{128,118}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>GetUp1_4.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{128,118}</string>
+                <key>spriteSourceSize</key>
+                <string>{128,118}</string>
+                <key>textureRect</key>
+                <string>{{678,631},{128,118}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>GetUp1_5.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{128,118}</string>
+                <key>spriteSourceSize</key>
+                <string>{128,118}</string>
+                <key>textureRect</key>
+                <string>{{384,871},{128,118}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
             <key>GetUp1_6.png</key>
             <dict>
                 <key>aliases</key>
@@ -825,7 +825,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,118}</string>
                 <key>textureRect</key>
-                <string>{{384,870},{128,118}}</string>
+                <string>{{256,872},{128,118}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -840,7 +840,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,118}</string>
                 <key>textureRect</key>
-                <string>{{256,871},{128,118}}</string>
+                <string>{{128,964},{128,118}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -855,7 +855,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{940,0},{70,128}}</string>
+                <string>{{608,531},{70,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -870,7 +870,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{940,128},{70,128}}</string>
+                <string>{{608,659},{70,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -885,7 +885,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{940,256},{70,128}}</string>
+                <string>{{608,787},{70,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -900,7 +900,7 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{937,384},{70,128}}</string>
+                <string>{{608,915},{70,128}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -915,9 +915,9 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{936,512},{70,128}}</string>
+                <string>{{128,1290},{70,128}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Idle1_14.png</key>
             <dict>
@@ -930,9 +930,9 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{608,531},{70,128}}</string>
+                <string>{{0,1300},{70,128}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Idle1_15.png</key>
             <dict>
@@ -945,9 +945,9 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{608,659},{70,128}}</string>
+                <string>{{0,1370},{70,128}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Idle1_2.png</key>
             <dict>
@@ -960,9 +960,9 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{608,659},{70,128}}</string>
+                <string>{{0,1370},{70,128}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Idle1_3.png</key>
             <dict>
@@ -975,9 +975,9 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{608,531},{70,128}}</string>
+                <string>{{0,1300},{70,128}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Idle1_4.png</key>
             <dict>
@@ -990,71 +990,11 @@
                 <key>spriteSourceSize</key>
                 <string>{70,128}</string>
                 <key>textureRect</key>
-                <string>{{936,512},{70,128}}</string>
+                <string>{{128,1290},{70,128}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Idle1_5.png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{70,128}</string>
-                <key>spriteSourceSize</key>
-                <string>{70,128}</string>
-                <key>textureRect</key>
-                <string>{{937,384},{70,128}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>Idle1_6.png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{70,128}</string>
-                <key>spriteSourceSize</key>
-                <string>{70,128}</string>
-                <key>textureRect</key>
-                <string>{{940,256},{70,128}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>Idle1_7.png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{70,128}</string>
-                <key>spriteSourceSize</key>
-                <string>{70,128}</string>
-                <key>textureRect</key>
-                <string>{{940,128},{70,128}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>Idle1_8.png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{70,128}</string>
-                <key>spriteSourceSize</key>
-                <string>{70,128}</string>
-                <key>textureRect</key>
-                <string>{{608,787},{70,128}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>Idle1_9.png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
@@ -1069,6 +1009,66 @@
                 <key>textureRotated</key>
                 <false/>
             </dict>
+            <key>Idle1_6.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{70,128}</string>
+                <key>spriteSourceSize</key>
+                <string>{70,128}</string>
+                <key>textureRect</key>
+                <string>{{608,787},{70,128}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>Idle1_7.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{70,128}</string>
+                <key>spriteSourceSize</key>
+                <string>{70,128}</string>
+                <key>textureRect</key>
+                <string>{{608,659},{70,128}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>Idle1_8.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{70,128}</string>
+                <key>spriteSourceSize</key>
+                <string>{70,128}</string>
+                <key>textureRect</key>
+                <string>{{806,967},{70,128}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>Idle1_9.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{70,128}</string>
+                <key>spriteSourceSize</key>
+                <string>{70,128}</string>
+                <key>textureRect</key>
+                <string>{{678,973},{70,128}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
             <key>InAirAtk1_0.png</key>
             <dict>
                 <key>aliases</key>
@@ -1080,7 +1080,7 @@
                 <key>spriteSourceSize</key>
                 <string>{112,96}</string>
                 <key>textureRect</key>
-                <string>{{228,1197},{112,96}}</string>
+                <string>{{128,1360},{112,96}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1125,7 +1125,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,112}</string>
                 <key>textureRect</key>
-                <string>{{256,989},{128,112}}</string>
+                <string>{{678,749},{128,112}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1140,7 +1140,7 @@
                 <key>spriteSourceSize</key>
                 <string>{96,96}</string>
                 <key>textureRect</key>
-                <string>{{672,1363},{96,96}}</string>
+                <string>{{784,1357},{96,96}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1155,7 +1155,7 @@
                 <key>spriteSourceSize</key>
                 <string>{80,96}</string>
                 <key>textureRect</key>
-                <string>{{672,1267},{80,96}}</string>
+                <string>{{934,976},{80,96}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1170,7 +1170,7 @@
                 <key>spriteSourceSize</key>
                 <string>{112,112}</string>
                 <key>textureRect</key>
-                <string>{{560,1292},{112,112}}</string>
+                <string>{{688,1155},{112,112}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1185,7 +1185,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,96}</string>
                 <key>textureRect</key>
-                <string>{{384,1100},{128,96}}</string>
+                <string>{{256,1102},{128,96}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1200,9 +1200,9 @@
                 <key>spriteSourceSize</key>
                 <string>{80,112}</string>
                 <key>textureRect</key>
-                <string>{{800,1038},{80,112}}</string>
+                <string>{{934,640},{80,112}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>InAirIdle1_1.png</key>
             <dict>
@@ -1215,9 +1215,9 @@
                 <key>spriteSourceSize</key>
                 <string>{80,112}</string>
                 <key>textureRect</key>
-                <string>{{800,1118},{80,112}}</string>
+                <string>{{934,752},{80,112}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>InAirIdle1_2.png</key>
             <dict>
@@ -1230,7 +1230,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,128}</string>
                 <key>textureRect</key>
-                <string>{{678,974},{64,128}}</string>
+                <string>{{256,1294},{64,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1245,9 +1245,9 @@
                 <key>spriteSourceSize</key>
                 <string>{80,112}</string>
                 <key>textureRect</key>
-                <string>{{756,1198},{80,112}}</string>
+                <string>{{934,864},{80,112}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>InAirIdle1_4.png</key>
             <dict>
@@ -1260,9 +1260,9 @@
                 <key>spriteSourceSize</key>
                 <string>{80,96}</string>
                 <key>textureRect</key>
-                <string>{{752,1278},{80,96}}</string>
+                <string>{{608,1043},{80,96}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>InAirIdle1_5.png</key>
             <dict>
@@ -1275,7 +1275,7 @@
                 <key>spriteSourceSize</key>
                 <string>{80,96}</string>
                 <key>textureRect</key>
-                <string>{{768,1358},{80,96}}</string>
+                <string>{{608,1139},{80,96}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1290,7 +1290,7 @@
                 <key>spriteSourceSize</key>
                 <string>{80,96}</string>
                 <key>textureRect</key>
-                <string>{{868,1248},{80,96}}</string>
+                <string>{{688,1267},{80,96}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1305,9 +1305,9 @@
                 <key>spriteSourceSize</key>
                 <string>{96,112}</string>
                 <key>textureRect</key>
-                <string>{{704,1038},{96,112}}</string>
+                <string>{{912,1296},{96,112}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>InAirIdle1_8.png</key>
             <dict>
@@ -1320,7 +1320,7 @@
                 <key>spriteSourceSize</key>
                 <string>{96,128}</string>
                 <key>textureRect</key>
-                <string>{{256,1101},{96,128}}</string>
+                <string>{{128,1194},{96,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1335,7 +1335,7 @@
                 <key>spriteSourceSize</key>
                 <string>{96,128}</string>
                 <key>textureRect</key>
-                <string>{{806,862},{96,128}}</string>
+                <string>{{256,1198},{96,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1414,6 +1414,51 @@
                 <key>textureRotated</key>
                 <true/>
             </dict>
+            <key>TurnAround1_1.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{112,128}</string>
+                <key>spriteSourceSize</key>
+                <string>{112,128}</string>
+                <key>textureRect</key>
+                <string>{{806,855},{112,128}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>TurnAround1_2.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{112,128}</string>
+                <key>spriteSourceSize</key>
+                <string>{112,128}</string>
+                <key>textureRect</key>
+                <string>{{678,861},{112,128}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>TurnAround1_3.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{112,128}</string>
+                <key>spriteSourceSize</key>
+                <string>{112,128}</string>
+                <key>textureRect</key>
+                <string>{{384,1101},{112,128}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
             <key>Walking_1.png</key>
             <dict>
                 <key>aliases</key>
@@ -1455,7 +1500,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{680,512},{119,128}}</string>
+                <string>{{272,515},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1470,7 +1515,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{808,512},{119,128}}</string>
+                <string>{{128,608},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1485,7 +1530,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{272,515},{119,128}}</string>
+                <string>{{0,720},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1500,7 +1545,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{128,608},{119,128}}</string>
+                <string>{{400,515},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1515,7 +1560,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{0,720},{119,128}}</string>
+                <string>{{256,634},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1530,7 +1575,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{400,515},{119,128}}</string>
+                <string>{{128,727},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1545,7 +1590,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{678,631},{119,128}}</string>
+                <string>{{0,839},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1560,7 +1605,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{806,631},{119,128}}</string>
+                <string>{{384,634},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1575,7 +1620,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{256,634},{119,128}}</string>
+                <string>{{680,512},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1590,7 +1635,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{128,727},{119,128}}</string>
+                <string>{{808,512},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1605,7 +1650,7 @@
                 <key>spriteSourceSize</key>
                 <string>{119,128}</string>
                 <key>textureRect</key>
-                <string>{{0,839},{119,128}}</string>
+                <string>{{256,753},{119,128}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1621,9 +1666,9 @@
             <key>realTextureFileName</key>
             <string>KnifeGirl.png</string>
             <key>size</key>
-            <string>{1014,1459}</string>
+            <string>{1024,1456}</string>
             <key>smartupdate</key>
-            <string>$TexturePacker:SmartUpdate:4ca72309f7dc04bba6be361462471d91:9a48d10caa37a76ff8c43fb72bce6103:1ae107e0c6667a1ecb5ed98687517e0e$</string>
+            <string>$TexturePacker:SmartUpdate:8fd7507b5e24a1de6da5e4a6c568fcd3:d861e924a13180a640774a9c85662e57:1ae107e0c6667a1ecb5ed98687517e0e$</string>
             <key>textureFileName</key>
             <string>KnifeGirl.png</string>
         </dict>

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

@@ -3,8 +3,8 @@
   "uuid": "579bc0c1-f5e2-4a5d-889b-9d567e53b0e6",
   "rawTextureUuid": "385b0a2b-765c-43fc-9243-977baccfd37a",
   "size": {
-    "width": 1014,
-    "height": 1459
+    "width": 1024,
+    "height": 1456
   },
   "type": "Texture Packer",
   "subMetas": {
@@ -17,8 +17,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 806,
-      "trimY": 750,
+      "trimX": 384,
+      "trimY": 989,
       "width": 112,
       "height": 128,
       "rawWidth": 112,
@@ -39,8 +39,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 0,
-      "trimY": 1076,
+      "trimX": 256,
+      "trimY": 990,
       "width": 112,
       "height": 128,
       "rawWidth": 112,
@@ -83,8 +83,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 528,
-      "trimY": 515,
+      "trimX": 940,
+      "trimY": 0,
       "width": 80,
       "height": 128,
       "rawWidth": 80,
@@ -105,8 +105,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 934,
-      "trimY": 640,
+      "trimX": 940,
+      "trimY": 128,
       "width": 80,
       "height": 128,
       "rawWidth": 80,
@@ -128,7 +128,7 @@
       "offsetX": 0,
       "offsetY": 0,
       "trimX": 128,
-      "trimY": 1076,
+      "trimY": 1082,
       "width": 112,
       "height": 128,
       "rawWidth": 112,
@@ -149,8 +149,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 678,
-      "trimY": 862,
+      "trimX": 0,
+      "trimY": 1188,
       "width": 112,
       "height": 128,
       "rawWidth": 112,
@@ -215,8 +215,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 934,
-      "trimY": 768,
+      "trimX": 940,
+      "trimY": 256,
       "width": 80,
       "height": 128,
       "rawWidth": 80,
@@ -237,8 +237,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 934,
-      "trimY": 896,
+      "trimX": 937,
+      "trimY": 384,
       "width": 80,
       "height": 128,
       "rawWidth": 80,
@@ -256,11 +256,11 @@
       "rawTextureUuid": "385b0a2b-765c-43fc-9243-977baccfd37a",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": true,
+      "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 806,
-      "trimY": 958,
+      "trimX": 528,
+      "trimY": 515,
       "width": 80,
       "height": 128,
       "rawWidth": 80,
@@ -281,8 +281,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 934,
-      "trimY": 1024,
+      "trimX": 936,
+      "trimY": 512,
       "width": 80,
       "height": 128,
       "rawWidth": 80,
@@ -325,8 +325,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 128,
-      "trimY": 964,
+      "trimX": 0,
+      "trimY": 1076,
       "width": 128,
       "height": 112,
       "rawWidth": 128,
@@ -347,8 +347,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 912,
-      "trimY": 1152,
+      "trimX": 688,
+      "trimY": 1357,
       "width": 96,
       "height": 96,
       "rawWidth": 96,
@@ -369,8 +369,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 340,
-      "trimY": 1197,
+      "trimX": 240,
+      "trimY": 1360,
       "width": 96,
       "height": 112,
       "rawWidth": 96,
@@ -391,8 +391,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 452,
-      "trimY": 1196,
+      "trimX": 352,
+      "trimY": 1358,
       "width": 96,
       "height": 112,
       "rawWidth": 96,
@@ -413,8 +413,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 564,
-      "trimY": 1155,
+      "trimX": 920,
+      "trimY": 1072,
       "width": 96,
       "height": 112,
       "rawWidth": 96,
@@ -435,8 +435,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 608,
-      "trimY": 1043,
+      "trimX": 914,
+      "trimY": 1184,
       "width": 96,
       "height": 112,
       "rawWidth": 96,
@@ -479,8 +479,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 678,
-      "trimY": 750,
+      "trimX": 806,
+      "trimY": 631,
       "width": 128,
       "height": 112,
       "rawWidth": 128,
@@ -787,8 +787,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 448,
-      "trimY": 1293,
+      "trimX": 802,
+      "trimY": 1149,
       "width": 112,
       "height": 112,
       "rawWidth": 112,
@@ -806,11 +806,11 @@
       "rawTextureUuid": "385b0a2b-765c-43fc-9243-977baccfd37a",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": false,
+      "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 660,
-      "trimY": 1155,
+      "trimX": 800,
+      "trimY": 1261,
       "width": 96,
       "height": 112,
       "rawWidth": 96,
@@ -831,8 +831,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 384,
-      "trimY": 988,
+      "trimX": 806,
+      "trimY": 743,
       "width": 128,
       "height": 112,
       "rawWidth": 128,
@@ -941,8 +941,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 0,
-      "trimY": 1188,
+      "trimX": 806,
+      "trimY": 1037,
       "width": 114,
       "height": 112,
       "rawWidth": 114,
@@ -960,11 +960,11 @@
       "rawTextureUuid": "385b0a2b-765c-43fc-9243-977baccfd37a",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": false,
+      "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 114,
-      "trimY": 1188,
+      "trimX": 384,
+      "trimY": 1213,
       "width": 114,
       "height": 112,
       "rawWidth": 114,
@@ -985,8 +985,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 0,
-      "trimY": 1300,
+      "trimX": 464,
+      "trimY": 1327,
       "width": 114,
       "height": 112,
       "rawWidth": 114,
@@ -1007,8 +1007,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 112,
-      "trimY": 1300,
+      "trimX": 496,
+      "trimY": 1213,
       "width": 114,
       "height": 112,
       "rawWidth": 114,
@@ -1029,8 +1029,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 0,
-      "trimY": 1300,
+      "trimX": 464,
+      "trimY": 1327,
       "width": 114,
       "height": 112,
       "rawWidth": 114,
@@ -1051,8 +1051,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 224,
-      "trimY": 1300,
+      "trimX": 576,
+      "trimY": 1327,
       "width": 114,
       "height": 112,
       "rawWidth": 114,
@@ -1070,11 +1070,11 @@
       "rawTextureUuid": "385b0a2b-765c-43fc-9243-977baccfd37a",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": true,
+      "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 336,
-      "trimY": 1293,
+      "trimX": 688,
+      "trimY": 1043,
       "width": 114,
       "height": 112,
       "rawWidth": 114,
@@ -1095,8 +1095,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 384,
-      "trimY": 634,
+      "trimX": 128,
+      "trimY": 846,
       "width": 128,
       "height": 118,
       "rawWidth": 128,
@@ -1117,8 +1117,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 384,
-      "trimY": 752,
+      "trimX": 0,
+      "trimY": 958,
       "width": 128,
       "height": 118,
       "rawWidth": 128,
@@ -1139,7 +1139,7 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 256,
+      "trimX": 384,
       "trimY": 753,
       "width": 128,
       "height": 118,
@@ -1161,8 +1161,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 128,
-      "trimY": 846,
+      "trimX": 678,
+      "trimY": 631,
       "width": 128,
       "height": 118,
       "rawWidth": 128,
@@ -1183,8 +1183,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 0,
-      "trimY": 958,
+      "trimX": 384,
+      "trimY": 871,
       "width": 128,
       "height": 118,
       "rawWidth": 128,
@@ -1205,8 +1205,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 384,
-      "trimY": 870,
+      "trimX": 256,
+      "trimY": 872,
       "width": 128,
       "height": 118,
       "rawWidth": 128,
@@ -1227,8 +1227,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 256,
-      "trimY": 871,
+      "trimX": 128,
+      "trimY": 964,
       "width": 128,
       "height": 118,
       "rawWidth": 128,
@@ -1249,8 +1249,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 940,
-      "trimY": 0,
+      "trimX": 608,
+      "trimY": 531,
       "width": 70,
       "height": 128,
       "rawWidth": 70,
@@ -1271,8 +1271,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 940,
-      "trimY": 128,
+      "trimX": 608,
+      "trimY": 659,
       "width": 70,
       "height": 128,
       "rawWidth": 70,
@@ -1293,8 +1293,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 940,
-      "trimY": 256,
+      "trimX": 608,
+      "trimY": 787,
       "width": 70,
       "height": 128,
       "rawWidth": 70,
@@ -1315,8 +1315,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 937,
-      "trimY": 384,
+      "trimX": 608,
+      "trimY": 915,
       "width": 70,
       "height": 128,
       "rawWidth": 70,
@@ -1334,11 +1334,11 @@
       "rawTextureUuid": "385b0a2b-765c-43fc-9243-977baccfd37a",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": false,
+      "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 936,
-      "trimY": 512,
+      "trimX": 128,
+      "trimY": 1290,
       "width": 70,
       "height": 128,
       "rawWidth": 70,
@@ -1356,11 +1356,11 @@
       "rawTextureUuid": "385b0a2b-765c-43fc-9243-977baccfd37a",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": false,
+      "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 608,
-      "trimY": 531,
+      "trimX": 0,
+      "trimY": 1300,
       "width": 70,
       "height": 128,
       "rawWidth": 70,
@@ -1378,11 +1378,11 @@
       "rawTextureUuid": "385b0a2b-765c-43fc-9243-977baccfd37a",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": false,
+      "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 608,
-      "trimY": 659,
+      "trimX": 0,
+      "trimY": 1370,
       "width": 70,
       "height": 128,
       "rawWidth": 70,
@@ -1400,11 +1400,11 @@
       "rawTextureUuid": "385b0a2b-765c-43fc-9243-977baccfd37a",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": false,
+      "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 608,
-      "trimY": 659,
+      "trimX": 0,
+      "trimY": 1370,
       "width": 70,
       "height": 128,
       "rawWidth": 70,
@@ -1422,11 +1422,11 @@
       "rawTextureUuid": "385b0a2b-765c-43fc-9243-977baccfd37a",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": false,
+      "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 608,
-      "trimY": 531,
+      "trimX": 0,
+      "trimY": 1300,
       "width": 70,
       "height": 128,
       "rawWidth": 70,
@@ -1444,11 +1444,11 @@
       "rawTextureUuid": "385b0a2b-765c-43fc-9243-977baccfd37a",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": false,
+      "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 936,
-      "trimY": 512,
+      "trimX": 128,
+      "trimY": 1290,
       "width": 70,
       "height": 128,
       "rawWidth": 70,
@@ -1469,8 +1469,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 937,
-      "trimY": 384,
+      "trimX": 608,
+      "trimY": 915,
       "width": 70,
       "height": 128,
       "rawWidth": 70,
@@ -1491,8 +1491,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 940,
-      "trimY": 256,
+      "trimX": 608,
+      "trimY": 787,
       "width": 70,
       "height": 128,
       "rawWidth": 70,
@@ -1513,8 +1513,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 940,
-      "trimY": 128,
+      "trimX": 608,
+      "trimY": 659,
       "width": 70,
       "height": 128,
       "rawWidth": 70,
@@ -1532,11 +1532,11 @@
       "rawTextureUuid": "385b0a2b-765c-43fc-9243-977baccfd37a",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": false,
+      "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 608,
-      "trimY": 787,
+      "trimX": 806,
+      "trimY": 967,
       "width": 70,
       "height": 128,
       "rawWidth": 70,
@@ -1554,11 +1554,11 @@
       "rawTextureUuid": "385b0a2b-765c-43fc-9243-977baccfd37a",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": false,
+      "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 608,
-      "trimY": 915,
+      "trimX": 678,
+      "trimY": 973,
       "width": 70,
       "height": 128,
       "rawWidth": 70,
@@ -1579,8 +1579,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 228,
-      "trimY": 1197,
+      "trimX": 128,
+      "trimY": 1360,
       "width": 112,
       "height": 96,
       "rawWidth": 112,
@@ -1645,8 +1645,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 256,
-      "trimY": 989,
+      "trimX": 678,
+      "trimY": 749,
       "width": 128,
       "height": 112,
       "rawWidth": 128,
@@ -1667,8 +1667,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 672,
-      "trimY": 1363,
+      "trimX": 784,
+      "trimY": 1357,
       "width": 96,
       "height": 96,
       "rawWidth": 96,
@@ -1689,8 +1689,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 672,
-      "trimY": 1267,
+      "trimX": 934,
+      "trimY": 976,
       "width": 80,
       "height": 96,
       "rawWidth": 80,
@@ -1711,8 +1711,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 560,
-      "trimY": 1292,
+      "trimX": 688,
+      "trimY": 1155,
       "width": 112,
       "height": 112,
       "rawWidth": 112,
@@ -1733,8 +1733,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 384,
-      "trimY": 1100,
+      "trimX": 256,
+      "trimY": 1102,
       "width": 128,
       "height": 96,
       "rawWidth": 128,
@@ -1752,11 +1752,11 @@
       "rawTextureUuid": "385b0a2b-765c-43fc-9243-977baccfd37a",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": true,
+      "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 800,
-      "trimY": 1038,
+      "trimX": 934,
+      "trimY": 640,
       "width": 80,
       "height": 112,
       "rawWidth": 80,
@@ -1774,11 +1774,11 @@
       "rawTextureUuid": "385b0a2b-765c-43fc-9243-977baccfd37a",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": true,
+      "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 800,
-      "trimY": 1118,
+      "trimX": 934,
+      "trimY": 752,
       "width": 80,
       "height": 112,
       "rawWidth": 80,
@@ -1799,8 +1799,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 678,
-      "trimY": 974,
+      "trimX": 256,
+      "trimY": 1294,
       "width": 64,
       "height": 128,
       "rawWidth": 64,
@@ -1818,11 +1818,11 @@
       "rawTextureUuid": "385b0a2b-765c-43fc-9243-977baccfd37a",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": true,
+      "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 756,
-      "trimY": 1198,
+      "trimX": 934,
+      "trimY": 864,
       "width": 80,
       "height": 112,
       "rawWidth": 80,
@@ -1840,11 +1840,11 @@
       "rawTextureUuid": "385b0a2b-765c-43fc-9243-977baccfd37a",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": true,
+      "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 752,
-      "trimY": 1278,
+      "trimX": 608,
+      "trimY": 1043,
       "width": 80,
       "height": 96,
       "rawWidth": 80,
@@ -1865,8 +1865,8 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 768,
-      "trimY": 1358,
+      "trimX": 608,
+      "trimY": 1139,
       "width": 80,
       "height": 96,
       "rawWidth": 80,
@@ -1887,8 +1887,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 868,
-      "trimY": 1248,
+      "trimX": 688,
+      "trimY": 1267,
       "width": 80,
       "height": 96,
       "rawWidth": 80,
@@ -1906,11 +1906,11 @@
       "rawTextureUuid": "385b0a2b-765c-43fc-9243-977baccfd37a",
       "trimType": "auto",
       "trimThreshold": 1,
-      "rotated": false,
+      "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 704,
-      "trimY": 1038,
+      "trimX": 912,
+      "trimY": 1296,
       "width": 96,
       "height": 112,
       "rawWidth": 96,
@@ -1931,8 +1931,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 256,
-      "trimY": 1101,
+      "trimX": 128,
+      "trimY": 1194,
       "width": 96,
       "height": 128,
       "rawWidth": 96,
@@ -1953,8 +1953,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 806,
-      "trimY": 862,
+      "trimX": 256,
+      "trimY": 1198,
       "width": 96,
       "height": 128,
       "rawWidth": 96,
@@ -2076,6 +2076,72 @@
       "spriteType": "normal",
       "subMetas": {}
     },
+    "TurnAround1_1.png": {
+      "ver": "1.0.4",
+      "uuid": "28ee1f29-e538-4d36-bb5c-275f9e3b392b",
+      "rawTextureUuid": "385b0a2b-765c-43fc-9243-977baccfd37a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 806,
+      "trimY": 855,
+      "width": 112,
+      "height": 128,
+      "rawWidth": 112,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "TurnAround1_2.png": {
+      "ver": "1.0.4",
+      "uuid": "211a73bb-31d7-4e6c-901e-f6939d9214e0",
+      "rawTextureUuid": "385b0a2b-765c-43fc-9243-977baccfd37a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 678,
+      "trimY": 861,
+      "width": 112,
+      "height": 128,
+      "rawWidth": 112,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
+    "TurnAround1_3.png": {
+      "ver": "1.0.4",
+      "uuid": "048c41dc-fc00-4bc4-8041-6003e7c2b6e4",
+      "rawTextureUuid": "385b0a2b-765c-43fc-9243-977baccfd37a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": true,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 384,
+      "trimY": 1101,
+      "width": 112,
+      "height": 128,
+      "rawWidth": 112,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "spriteType": "normal",
+      "subMetas": {}
+    },
     "Walking_1.png": {
       "ver": "1.0.4",
       "uuid": "9435195e-4560-495e-b1ae-083c0c87e8a0",
@@ -2129,8 +2195,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 680,
-      "trimY": 512,
+      "trimX": 272,
+      "trimY": 515,
       "width": 119,
       "height": 128,
       "rawWidth": 119,
@@ -2151,8 +2217,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 808,
-      "trimY": 512,
+      "trimX": 128,
+      "trimY": 608,
       "width": 119,
       "height": 128,
       "rawWidth": 119,
@@ -2173,8 +2239,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 272,
-      "trimY": 515,
+      "trimX": 0,
+      "trimY": 720,
       "width": 119,
       "height": 128,
       "rawWidth": 119,
@@ -2195,8 +2261,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 128,
-      "trimY": 608,
+      "trimX": 400,
+      "trimY": 515,
       "width": 119,
       "height": 128,
       "rawWidth": 119,
@@ -2217,8 +2283,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 0,
-      "trimY": 720,
+      "trimX": 256,
+      "trimY": 634,
       "width": 119,
       "height": 128,
       "rawWidth": 119,
@@ -2239,8 +2305,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 400,
-      "trimY": 515,
+      "trimX": 128,
+      "trimY": 727,
       "width": 119,
       "height": 128,
       "rawWidth": 119,
@@ -2261,8 +2327,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 678,
-      "trimY": 631,
+      "trimX": 0,
+      "trimY": 839,
       "width": 119,
       "height": 128,
       "rawWidth": 119,
@@ -2283,8 +2349,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 806,
-      "trimY": 631,
+      "trimX": 384,
+      "trimY": 634,
       "width": 119,
       "height": 128,
       "rawWidth": 119,
@@ -2305,8 +2371,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 256,
-      "trimY": 634,
+      "trimX": 680,
+      "trimY": 512,
       "width": 119,
       "height": 128,
       "rawWidth": 119,
@@ -2327,8 +2393,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 128,
-      "trimY": 727,
+      "trimX": 808,
+      "trimY": 512,
       "width": 119,
       "height": 128,
       "rawWidth": 119,
@@ -2349,8 +2415,8 @@
       "rotated": true,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 0,
-      "trimY": 839,
+      "trimX": 256,
+      "trimY": 753,
       "width": 119,
       "height": 128,
       "rawWidth": 119,

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

@@ -0,0 +1,43 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "TurnAround1",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.15,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "28ee1f29-e538-4d36-bb5c-275f9e3b392b"
+            }
+          },
+          {
+            "frame": 0.03333333333333333,
+            "value": {
+              "__uuid__": "211a73bb-31d7-4e6c-901e-f6939d9214e0"
+            }
+          },
+          {
+            "frame": 0.08333333333333333,
+            "value": {
+              "__uuid__": "048c41dc-fc00-4bc4-8041-6003e7c2b6e4"
+            }
+          },
+          {
+            "frame": 0.13333333333333333,
+            "value": {
+              "__uuid__": "9435195e-4560-495e-b1ae-083c0c87e8a0"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

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

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "e906322d-a08b-4477-a2e9-98acd42fa034",
+  "subMetas": {}
+}

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

@@ -3,7 +3,7 @@
   "_name": "Walking",
   "_objFlags": 0,
   "_native": "",
-  "_duration": 1.5166666666666666,
+  "_duration": 0.6333333333333333,
   "sample": 60,
   "speed": 1.2,
   "wrapMode": 2,
@@ -13,78 +13,78 @@
         "spriteFrame": [
           {
             "frame": 0,
-            "value": {
-              "__uuid__": "c3b14ecc-a6d9-4cb3-8637-ca7b407a0f5c"
-            }
-          },
-          {
-            "frame": 0.08333333333333333,
             "value": {
               "__uuid__": "9435195e-4560-495e-b1ae-083c0c87e8a0"
             }
           },
           {
-            "frame": 0.18333333333333332,
+            "frame": 0.06666666666666667,
             "value": {
               "__uuid__": "ec048360-7a17-4f22-ba52-eb86ec1acae8"
             }
           },
           {
-            "frame": 0.2833333333333333,
+            "frame": 0.11666666666666667,
             "value": {
               "__uuid__": "82bb81e3-667c-4280-8710-211f4904ef2f"
             }
           },
           {
-            "frame": 0.4,
+            "frame": 0.16666666666666666,
+            "value": {
+              "__uuid__": "c3b14ecc-a6d9-4cb3-8637-ca7b407a0f5c"
+            }
+          },
+          {
+            "frame": 0.21666666666666667,
             "value": {
               "__uuid__": "f958fb7f-ef5a-4918-81f3-564004572f45"
             }
           },
           {
-            "frame": 0.5333333333333333,
+            "frame": 0.26666666666666666,
             "value": {
               "__uuid__": "8a0ecf92-db26-4206-9a80-20e749055def"
             }
           },
           {
-            "frame": 0.65,
+            "frame": 0.31666666666666665,
             "value": {
               "__uuid__": "942f2e02-a700-4fbf-877e-08c93e4d4010"
             }
           },
           {
-            "frame": 0.7666666666666667,
+            "frame": 0.36666666666666664,
             "value": {
               "__uuid__": "30546064-1a11-499e-8523-a82c83951c73"
             }
           },
           {
-            "frame": 0.9,
+            "frame": 0.4166666666666667,
             "value": {
               "__uuid__": "515bb75f-7a1f-4500-8aa9-c895915ce19f"
             }
           },
           {
-            "frame": 1.0333333333333334,
+            "frame": 0.4666666666666667,
             "value": {
               "__uuid__": "9100da6b-7582-4afb-9698-3d67d3b2012d"
             }
           },
           {
-            "frame": 1.2166666666666666,
+            "frame": 0.5166666666666667,
             "value": {
               "__uuid__": "1257f72d-0cb3-4750-ae70-13c2d8eb2269"
             }
           },
           {
-            "frame": 1.3833333333333333,
+            "frame": 0.5666666666666667,
             "value": {
               "__uuid__": "1d34b6db-27ba-4e26-864d-0f00d501765e"
             }
           },
           {
-            "frame": 1.5,
+            "frame": 0.6166666666666667,
             "value": {
               "__uuid__": "c317a75a-52c0-4c38-9300-a064cbf4efb3"
             }

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

@@ -0,0 +1,43 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "TurnAround1",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.15,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "ee5e05fa-b515-470f-bc3c-43544f02cb92"
+            }
+          },
+          {
+            "frame": 0.03333333333333333,
+            "value": {
+              "__uuid__": "ffa521b6-118e-46e8-be1c-51cc54381ec8"
+            }
+          },
+          {
+            "frame": 0.08333333333333333,
+            "value": {
+              "__uuid__": "0b27d2c9-c5a3-4020-adbe-0297c1ba3aeb"
+            }
+          },
+          {
+            "frame": 0.13333333333333333,
+            "value": {
+              "__uuid__": "a47f518e-62fb-4549-8897-4f2d387bd145"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

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

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "edd23b2f-1caa-4836-88a7-e4af1f26743e",
+  "subMetas": {}
+}

frontend/assets/resources/animation/MonkGirl/MonkGirl.plist

@@ -15,7 +15,7 @@
                 <key>spriteSourceSize</key>
                 <string>{62,92}</string>
                 <key>textureRect</key>
-                <string>{{1277,188},{62,92}}</string>
+                <string>{{1307,188},{62,92}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -30,7 +30,7 @@
                 <key>spriteSourceSize</key>
                 <string>{77,99}</string>
                 <key>textureRect</key>
-                <string>{{748,0},{77,99}}</string>
+                <string>{{782,101},{77,99}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -45,7 +45,7 @@
                 <key>spriteSourceSize</key>
                 <string>{112,99}</string>
                 <key>textureRect</key>
-                <string>{{408,348},{112,99}}</string>
+                <string>{{381,360},{112,99}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -60,7 +60,7 @@
                 <key>spriteSourceSize</key>
                 <string>{96,100}</string>
                 <key>textureRect</key>
-                <string>{{664,315},{96,100}}</string>
+                <string>{{704,312},{96,100}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -75,7 +75,7 @@
                 <key>spriteSourceSize</key>
                 <string>{62,92}</string>
                 <key>textureRect</key>
-                <string>{{1277,188},{62,92}}</string>
+                <string>{{1307,188},{62,92}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -90,7 +90,7 @@
                 <key>spriteSourceSize</key>
                 <string>{58,97}</string>
                 <key>textureRect</key>
-                <string>{{1023,194},{58,97}}</string>
+                <string>{{983,388},{58,97}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -105,9 +105,9 @@
                 <key>spriteSourceSize</key>
                 <string>{60,90}</string>
                 <key>textureRect</key>
-                <string>{{1393,141},{60,90}}</string>
+                <string>{{1424,0},{60,90}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>Atk2_2.png</key>
             <dict>
@@ -120,7 +120,7 @@
                 <key>spriteSourceSize</key>
                 <string>{84,96}</string>
                 <key>textureRect</key>
-                <string>{{1087,97},{84,96}}</string>
+                <string>{{1082,291},{84,96}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -135,7 +135,7 @@
                 <key>spriteSourceSize</key>
                 <string>{55,100}</string>
                 <key>textureRect</key>
-                <string>{{731,101},{55,100}}</string>
+                <string>{{738,206},{55,100}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -150,9 +150,9 @@
                 <key>spriteSourceSize</key>
                 <string>{63,100}</string>
                 <key>textureRect</key>
-                <string>{{717,206},{63,100}}</string>
+                <string>{{0,437},{63,100}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Atk2_5.png</key>
             <dict>
@@ -165,7 +165,7 @@
                 <key>spriteSourceSize</key>
                 <string>{66,101}</string>
                 <key>textureRect</key>
-                <string>{{682,0},{66,101}}</string>
+                <string>{{755,0},{66,101}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -180,7 +180,7 @@
                 <key>spriteSourceSize</key>
                 <string>{80,95}</string>
                 <key>textureRect</key>
-                <string>{{1126,0},{80,95}}</string>
+                <string>{{1099,387},{80,95}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -195,7 +195,7 @@
                 <key>spriteSourceSize</key>
                 <string>{116,109}</string>
                 <key>textureRect</key>
-                <string>{{315,119},{116,109}}</string>
+                <string>{{336,244},{116,109}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -210,7 +210,7 @@
                 <key>spriteSourceSize</key>
                 <string>{102,96}</string>
                 <key>textureRect</key>
-                <string>{{621,213},{102,96}}</string>
+                <string>{{608,325},{102,96}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -225,9 +225,9 @@
                 <key>spriteSourceSize</key>
                 <string>{75,102}</string>
                 <key>textureRect</key>
-                <string>{{139,421},{75,102}}</string>
+                <string>{{663,210},{75,102}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>Atk3_0.png</key>
             <dict>
@@ -240,7 +240,7 @@
                 <key>spriteSourceSize</key>
                 <string>{66,109}</string>
                 <key>textureRect</key>
-                <string>{{469,110},{66,109}}</string>
+                <string>{{480,339},{66,109}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -255,7 +255,7 @@
                 <key>spriteSourceSize</key>
                 <string>{66,113}</string>
                 <key>textureRect</key>
-                <string>{{355,235},{66,113}}</string>
+                <string>{{403,114},{66,113}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -330,7 +330,7 @@
                 <key>spriteSourceSize</key>
                 <string>{78,131}</string>
                 <key>textureRect</key>
-                <string>{{137,290},{78,131}}</string>
+                <string>{{78,0},{78,131}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -345,9 +345,9 @@
                 <key>spriteSourceSize</key>
                 <string>{59,139}</string>
                 <key>textureRect</key>
-                <string>{{0,437},{59,139}}</string>
+                <string>{{78,290},{59,139}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>Atk3_8.png</key>
             <dict>
@@ -360,7 +360,7 @@
                 <key>spriteSourceSize</key>
                 <string>{59,139}</string>
                 <key>textureRect</key>
-                <string>{{78,290},{59,139}}</string>
+                <string>{{137,290},{59,139}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -375,9 +375,9 @@
                 <key>spriteSourceSize</key>
                 <string>{62,97}</string>
                 <key>textureRect</key>
-                <string>{{507,434},{62,97}}</string>
+                <string>{{962,291},{62,97}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>Atked1_1.png</key>
             <dict>
@@ -390,9 +390,9 @@
                 <key>spriteSourceSize</key>
                 <string>{73,95}</string>
                 <key>textureRect</key>
-                <string>{{1171,95},{73,95}}</string>
+                <string>{{641,427},{73,95}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Atked1_2.png</key>
             <dict>
@@ -405,7 +405,7 @@
                 <key>spriteSourceSize</key>
                 <string>{90,89}</string>
                 <key>textureRect</key>
-                <string>{{1324,0},{90,89}}</string>
+                <string>{{1335,0},{90,89}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -420,7 +420,7 @@
                 <key>spriteSourceSize</key>
                 <string>{95,80}</string>
                 <key>textureRect</key>
-                <string>{{1084,291},{95,80}}</string>
+                <string>{{1168,193},{95,80}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -435,7 +435,7 @@
                 <key>spriteSourceSize</key>
                 <string>{80,95}</string>
                 <key>textureRect</key>
-                <string>{{1010,388},{80,95}}</string>
+                <string>{{1166,290},{80,95}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -450,7 +450,7 @@
                 <key>spriteSourceSize</key>
                 <string>{83,92}</string>
                 <key>textureRect</key>
-                <string>{{1208,382},{83,92}}</string>
+                <string>{{1299,382},{83,92}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -465,7 +465,7 @@
                 <key>spriteSourceSize</key>
                 <string>{92,83}</string>
                 <key>textureRect</key>
-                <string>{{1224,284},{92,83}}</string>
+                <string>{{1306,284},{92,83}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -480,7 +480,7 @@
                 <key>spriteSourceSize</key>
                 <string>{112,45}</string>
                 <key>textureRect</key>
-                <string>{{424,115},{112,45}}</string>
+                <string>{{469,112},{112,45}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -495,7 +495,7 @@
                 <key>spriteSourceSize</key>
                 <string>{88,69}</string>
                 <key>textureRect</key>
-                <string>{{604,427},{88,69}}</string>
+                <string>{{1443,222},{88,69}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -510,7 +510,7 @@
                 <key>spriteSourceSize</key>
                 <string>{91,90}</string>
                 <key>textureRect</key>
-                <string>{{1303,93},{91,90}}</string>
+                <string>{{1313,93},{91,90}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -525,7 +525,7 @@
                 <key>spriteSourceSize</key>
                 <string>{120,93}</string>
                 <key>textureRect</key>
-                <string>{{222,123},{120,93}}</string>
+                <string>{{254,124},{120,93}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -540,9 +540,9 @@
                 <key>spriteSourceSize</key>
                 <string>{100,112}</string>
                 <key>textureRect</key>
-                <string>{{241,396},{100,112}}</string>
+                <string>{{408,0},{100,112}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>GetUp1_5.png</key>
             <dict>
@@ -555,7 +555,7 @@
                 <key>spriteSourceSize</key>
                 <string>{106,93}</string>
                 <key>textureRect</key>
-                <string>{{507,328},{106,93}}</string>
+                <string>{{570,219},{106,93}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -570,7 +570,7 @@
                 <key>spriteSourceSize</key>
                 <string>{106,79}</string>
                 <key>textureRect</key>
-                <string>{{542,217},{106,79}}</string>
+                <string>{{571,108},{106,79}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -585,7 +585,7 @@
                 <key>spriteSourceSize</key>
                 <string>{73,87}</string>
                 <key>textureRect</key>
-                <string>{{1307,280},{73,87}}</string>
+                <string>{{1382,376},{73,87}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -600,9 +600,9 @@
                 <key>spriteSourceSize</key>
                 <string>{67,90}</string>
                 <key>textureRect</key>
-                <string>{{1413,74},{67,90}}</string>
+                <string>{{1403,90},{67,90}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>GetUp1_9.png</key>
             <dict>
@@ -615,7 +615,7 @@
                 <key>spriteSourceSize</key>
                 <string>{58,97}</string>
                 <key>textureRect</key>
-                <string>{{1023,194},{58,97}}</string>
+                <string>{{983,388},{58,97}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -630,7 +630,7 @@
                 <key>spriteSourceSize</key>
                 <string>{58,95}</string>
                 <key>textureRect</key>
-                <string>{{1090,386},{58,95}}</string>
+                <string>{{1219,0},{58,95}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -645,7 +645,7 @@
                 <key>spriteSourceSize</key>
                 <string>{58,97}</string>
                 <key>textureRect</key>
-                <string>{{1029,97},{58,97}}</string>
+                <string>{{1024,291},{58,97}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -660,7 +660,7 @@
                 <key>spriteSourceSize</key>
                 <string>{60,94}</string>
                 <key>textureRect</key>
-                <string>{{1148,386},{60,94}}</string>
+                <string>{{1179,385},{60,94}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -675,7 +675,7 @@
                 <key>spriteSourceSize</key>
                 <string>{58,97}</string>
                 <key>textureRect</key>
-                <string>{{1081,194},{58,97}}</string>
+                <string>{{1036,194},{58,97}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -690,7 +690,7 @@
                 <key>spriteSourceSize</key>
                 <string>{58,97}</string>
                 <key>textureRect</key>
-                <string>{{1068,0},{58,97}}</string>
+                <string>{{1041,388},{58,97}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -705,9 +705,9 @@
                 <key>spriteSourceSize</key>
                 <string>{60,95}</string>
                 <key>textureRect</key>
-                <string>{{1206,0},{60,95}}</string>
+                <string>{{546,440},{60,95}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Idle1_5.png</key>
             <dict>
@@ -720,7 +720,7 @@
                 <key>spriteSourceSize</key>
                 <string>{60,94}</string>
                 <key>textureRect</key>
-                <string>{{1164,288},{60,94}}</string>
+                <string>{{1239,385},{60,94}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -735,7 +735,7 @@
                 <key>spriteSourceSize</key>
                 <string>{59,93}</string>
                 <key>textureRect</key>
-                <string>{{789,403},{59,93}}</string>
+                <string>{{1248,191},{59,93}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -750,7 +750,7 @@
                 <key>spriteSourceSize</key>
                 <string>{58,93}</string>
                 <key>textureRect</key>
-                <string>{{1266,0},{58,93}}</string>
+                <string>{{1277,0},{58,93}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -765,7 +765,7 @@
                 <key>spriteSourceSize</key>
                 <string>{59,93}</string>
                 <key>textureRect</key>
-                <string>{{1244,95},{59,93}}</string>
+                <string>{{1254,95},{59,93}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -780,7 +780,7 @@
                 <key>spriteSourceSize</key>
                 <string>{60,94}</string>
                 <key>textureRect</key>
-                <string>{{1217,190},{60,94}}</string>
+                <string>{{1246,288},{60,94}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -795,7 +795,7 @@
                 <key>spriteSourceSize</key>
                 <string>{77,68}</string>
                 <key>textureRect</key>
-                <string>{{1437,417},{77,68}}</string>
+                <string>{{1473,291},{77,68}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -810,7 +810,7 @@
                 <key>spriteSourceSize</key>
                 <string>{118,76}</string>
                 <key>textureRect</key>
-                <string>{{215,278},{118,76}}</string>
+                <string>{{196,284},{118,76}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -825,7 +825,7 @@
                 <key>spriteSourceSize</key>
                 <string>{104,65}</string>
                 <key>textureRect</key>
-                <string>{{617,0},{104,65}}</string>
+                <string>{{650,106},{104,65}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -840,9 +840,9 @@
                 <key>spriteSourceSize</key>
                 <string>{80,66}</string>
                 <key>textureRect</key>
-                <string>{{1380,285},{80,66}}</string>
+                <string>{{1473,368},{80,66}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>InAirAtk1_12.png</key>
             <dict>
@@ -855,7 +855,7 @@
                 <key>spriteSourceSize</key>
                 <string>{102,67}</string>
                 <key>textureRect</key>
-                <string>{{664,104},{102,67}}</string>
+                <string>{{715,104},{102,67}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -870,9 +870,9 @@
                 <key>spriteSourceSize</key>
                 <string>{79,66}</string>
                 <key>textureRect</key>
-                <string>{{1339,201},{79,66}}</string>
+                <string>{{1470,90},{79,66}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>InAirAtk1_3.png</key>
             <dict>
@@ -885,7 +885,7 @@
                 <key>spriteSourceSize</key>
                 <string>{124,64}</string>
                 <key>textureRect</key>
-                <string>{{78,0},{124,64}}</string>
+                <string>{{156,0},{124,64}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -900,7 +900,7 @@
                 <key>spriteSourceSize</key>
                 <string>{104,64}</string>
                 <key>textureRect</key>
-                <string>{{600,323},{104,64}}</string>
+                <string>{{691,0},{104,64}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -915,7 +915,7 @@
                 <key>spriteSourceSize</key>
                 <string>{79,61}</string>
                 <key>textureRect</key>
-                <string>{{1376,417},{79,61}}</string>
+                <string>{{1484,0},{79,61}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -930,7 +930,7 @@
                 <key>spriteSourceSize</key>
                 <string>{124,64}</string>
                 <key>textureRect</key>
-                <string>{{142,0},{124,64}}</string>
+                <string>{{160,124},{124,64}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -945,7 +945,7 @@
                 <key>spriteSourceSize</key>
                 <string>{106,67}</string>
                 <key>textureRect</key>
-                <string>{{597,107},{106,67}}</string>
+                <string>{{624,0},{106,67}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -960,7 +960,7 @@
                 <key>spriteSourceSize</key>
                 <string>{79,66}</string>
                 <key>textureRect</key>
-                <string>{{1380,351},{79,66}}</string>
+                <string>{{1470,156},{79,66}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -975,7 +975,7 @@
                 <key>spriteSourceSize</key>
                 <string>{118,64}</string>
                 <key>textureRect</key>
-                <string>{{291,243},{118,64}}</string>
+                <string>{{272,284},{118,64}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -990,9 +990,9 @@
                 <key>spriteSourceSize</key>
                 <string>{71,119}</string>
                 <key>textureRect</key>
-                <string>{{242,0},{71,119}}</string>
+                <string>{{100,429},{71,119}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>InAirIdle1_1.png</key>
             <dict>
@@ -1005,7 +1005,7 @@
                 <key>spriteSourceSize</key>
                 <string>{71,119}</string>
                 <key>textureRect</key>
-                <string>{{313,0},{71,119}}</string>
+                <string>{{282,0},{71,119}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1020,7 +1020,7 @@
                 <key>spriteSourceSize</key>
                 <string>{55,114}</string>
                 <key>textureRect</key>
-                <string>{{353,361},{55,114}}</string>
+                <string>{{353,0},{55,114}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1035,7 +1035,7 @@
                 <key>spriteSourceSize</key>
                 <string>{62,124}</string>
                 <key>textureRect</key>
-                <string>{{160,124},{62,124}}</string>
+                <string>{{220,0},{62,124}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1050,9 +1050,9 @@
                 <key>spriteSourceSize</key>
                 <string>{74,90}</string>
                 <key>textureRect</key>
-                <string>{{1413,0},{74,90}}</string>
+                <string>{{1369,184},{74,90}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>InAirIdle1_3.png</key>
             <dict>
@@ -1065,7 +1065,7 @@
                 <key>spriteSourceSize</key>
                 <string>{110,54}</string>
                 <key>textureRect</key>
-                <string>{{440,0},{110,54}}</string>
+                <string>{{508,0},{110,54}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1080,7 +1080,7 @@
                 <key>spriteSourceSize</key>
                 <string>{85,88}</string>
                 <key>textureRect</key>
-                <string>{{1291,376},{85,88}}</string>
+                <string>{{736,412},{85,88}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1095,7 +1095,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,112}</string>
                 <key>textureRect</key>
-                <string>{{421,235},{64,112}}</string>
+                <string>{{445,227},{64,112}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1110,7 +1110,7 @@
                 <key>spriteSourceSize</key>
                 <string>{62,107}</string>
                 <key>textureRect</key>
-                <string>{{555,0},{62,107}}</string>
+                <string>{{546,333},{62,107}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1125,9 +1125,9 @@
                 <key>spriteSourceSize</key>
                 <string>{85,84}</string>
                 <key>textureRect</key>
-                <string>{{1405,201},{85,84}}</string>
+                <string>{{1389,291},{85,84}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>InAirIdle1_8.png</key>
             <dict>
@@ -1140,7 +1140,7 @@
                 <key>spriteSourceSize</key>
                 <string>{109,61}</string>
                 <key>textureRect</key>
-                <string>{{494,0},{109,61}}</string>
+                <string>{{509,224},{109,61}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1155,7 +1155,7 @@
                 <key>spriteSourceSize</key>
                 <string>{78,95}</string>
                 <key>textureRect</key>
-                <string>{{1139,193},{78,95}}</string>
+                <string>{{1176,96},{78,95}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1170,7 +1170,7 @@
                 <key>spriteSourceSize</key>
                 <string>{115,56}</string>
                 <key>textureRect</key>
-                <string>{{384,0},{115,56}}</string>
+                <string>{{347,119},{115,56}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1185,7 +1185,7 @@
                 <key>spriteSourceSize</key>
                 <string>{109,57}</string>
                 <key>textureRect</key>
-                <string>{{485,219},{109,57}}</string>
+                <string>{{514,110},{109,57}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1200,7 +1200,7 @@
                 <key>spriteSourceSize</key>
                 <string>{108,62}</string>
                 <key>textureRect</key>
-                <string>{{535,109},{108,62}}</string>
+                <string>{{562,0},{108,62}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1215,9 +1215,9 @@
                 <key>spriteSourceSize</key>
                 <string>{123,36}</string>
                 <key>textureRect</key>
-                <string>{{206,0},{123,36}}</string>
+                <string>{{160,248},{123,36}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>LayDown1_4.png</key>
             <dict>
@@ -1230,7 +1230,52 @@
                 <key>spriteSourceSize</key>
                 <string>{123,30}</string>
                 <key>textureRect</key>
-                <string>{{160,248},{123,30}}</string>
+                <string>{{224,124},{123,30}}</string>
+                <key>textureRotated</key>
+                <true/>
+            </dict>
+            <key>TurnAround1_1.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{74,96}</string>
+                <key>spriteSourceSize</key>
+                <string>{74,96}</string>
+                <key>textureRect</key>
+                <string>{{1094,194},{74,96}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>TurnAround1_2.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{74,96}</string>
+                <key>spriteSourceSize</key>
+                <string>{74,96}</string>
+                <key>textureRect</key>
+                <string>{{1102,97},{74,96}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>TurnAround1_3.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{74,96}</string>
+                <key>spriteSourceSize</key>
+                <string>{74,96}</string>
+                <key>textureRect</key>
+                <string>{{1145,0},{74,96}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1245,9 +1290,9 @@
                 <key>spriteSourceSize</key>
                 <string>{81,97}</string>
                 <key>textureRect</key>
-                <string>{{692,415},{81,97}}</string>
+                <string>{{219,402},{81,97}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>Walking_10.png</key>
             <dict>
@@ -1260,7 +1305,7 @@
                 <key>spriteSourceSize</key>
                 <string>{81,97}</string>
                 <key>textureRect</key>
-                <string>{{760,306},{81,97}}</string>
+                <string>{{300,402},{81,97}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1275,7 +1320,7 @@
                 <key>spriteSourceSize</key>
                 <string>{81,97}</string>
                 <key>textureRect</key>
-                <string>{{780,201},{81,97}}</string>
+                <string>{{821,0},{81,97}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1290,7 +1335,7 @@
                 <key>spriteSourceSize</key>
                 <string>{81,97}</string>
                 <key>textureRect</key>
-                <string>{{786,99},{81,97}}</string>
+                <string>{{793,200},{81,97}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1305,7 +1350,7 @@
                 <key>spriteSourceSize</key>
                 <string>{81,97}</string>
                 <key>textureRect</key>
-                <string>{{825,0},{81,97}}</string>
+                <string>{{859,97},{81,97}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1320,7 +1365,7 @@
                 <key>spriteSourceSize</key>
                 <string>{81,97}</string>
                 <key>textureRect</key>
-                <string>{{841,298},{81,97}}</string>
+                <string>{{902,0},{81,97}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1335,7 +1380,7 @@
                 <key>spriteSourceSize</key>
                 <string>{81,97}</string>
                 <key>textureRect</key>
-                <string>{{848,395},{81,97}}</string>
+                <string>{{800,297},{81,97}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1350,7 +1395,7 @@
                 <key>spriteSourceSize</key>
                 <string>{81,97}</string>
                 <key>textureRect</key>
-                <string>{{861,196},{81,97}}</string>
+                <string>{{874,194},{81,97}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1365,7 +1410,7 @@
                 <key>spriteSourceSize</key>
                 <string>{81,97}</string>
                 <key>textureRect</key>
-                <string>{{867,97},{81,97}}</string>
+                <string>{{940,97},{81,97}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1380,7 +1425,7 @@
                 <key>spriteSourceSize</key>
                 <string>{81,97}</string>
                 <key>textureRect</key>
-                <string>{{906,0},{81,97}}</string>
+                <string>{{983,0},{81,97}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1395,7 +1440,7 @@
                 <key>spriteSourceSize</key>
                 <string>{81,97}</string>
                 <key>textureRect</key>
-                <string>{{922,293},{81,97}}</string>
+                <string>{{821,394},{81,97}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1410,7 +1455,7 @@
                 <key>spriteSourceSize</key>
                 <string>{81,97}</string>
                 <key>textureRect</key>
-                <string>{{942,194},{81,97}}</string>
+                <string>{{881,291},{81,97}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1425,7 +1470,7 @@
                 <key>spriteSourceSize</key>
                 <string>{81,97}</string>
                 <key>textureRect</key>
-                <string>{{948,97},{81,97}}</string>
+                <string>{{955,194},{81,97}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1440,7 +1485,7 @@
                 <key>spriteSourceSize</key>
                 <string>{81,97}</string>
                 <key>textureRect</key>
-                <string>{{987,0},{81,97}}</string>
+                <string>{{1021,97},{81,97}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1455,7 +1500,7 @@
                 <key>spriteSourceSize</key>
                 <string>{81,97}</string>
                 <key>textureRect</key>
-                <string>{{929,390},{81,97}}</string>
+                <string>{{1064,0},{81,97}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1470,7 +1515,7 @@
                 <key>spriteSourceSize</key>
                 <string>{81,97}</string>
                 <key>textureRect</key>
-                <string>{{1003,291},{81,97}}</string>
+                <string>{{902,388},{81,97}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1486,9 +1531,9 @@
             <key>realTextureFileName</key>
             <string>MonkGirl.png</string>
             <key>size</key>
-            <string>{1505,496}</string>
+            <string>{1549,500}</string>
             <key>smartupdate</key>
-            <string>$TexturePacker:SmartUpdate:8383576ddc6ed0fb9e6adcbc98ec9c07:b0caf27c9f592741053365a3d87b3473:7b088363a1f16e4f4ff313aecc52227b$</string>
+            <string>$TexturePacker:SmartUpdate:f2fd96a7a4bba5a2e1c4622dcb63e1f2:17c698372c46bf0be82704dd808cd6f4:7b088363a1f16e4f4ff313aecc52227b$</string>
             <key>textureFileName</key>
             <string>MonkGirl.png</string>
         </dict>

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

@@ -0,0 +1,43 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "TurnAround1",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.15,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "c1a00209-f74d-41b5-a5da-df5720ac34b4"
+            }
+          },
+          {
+            "frame": 0.03333333333333333,
+            "value": {
+              "__uuid__": "2b52c0f1-2360-4a2b-9233-bf5662de09a5"
+            }
+          },
+          {
+            "frame": 0.08333333333333333,
+            "value": {
+              "__uuid__": "e3f9dfe7-ed91-4dc3-b68b-a3a3c2637074"
+            }
+          },
+          {
+            "frame": 0.13333333333333333,
+            "value": {
+              "__uuid__": "7515ef50-3a14-4e58-8811-a0c890fc40f3"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

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

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "6e1139d4-03dd-4bd4-9510-606e94f629fe",
+  "subMetas": {}
+}

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

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="128" height="64" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="135">
+<map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="128" height="64" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="137">
  <tileset firstgid="1" source="tiles0.tsx"/>
  <tileset firstgid="65" source="tiles1.tsx"/>
  <tileset firstgid="129" source="tiles2.tsx"/>
  <layer id="6" name="Ground" width="128" height="64">
   <data encoding="base64" compression="zlib">
-   eJzt2ztuAjEURmELlIYuiKRHyk4iGjo2wP6XkRDGUmThxwx3fC3+U3wNw8v3eEyabEMIWwAAAAAAAAAAAADo4IQ/3h08+3t/B2/KM1BeOzPQXjsz0F47M6iv/c3oc6zeh/7+/Q+NHr1P6z7YGz2H/svWXur1TP/SvqL/OP1LnSz6t7Qt9a1dp//4/VvOgJJeM3hlLf2tzNljI83glY2+9vcMpRko9E/PgFz3NfbBKDNQ7r+kvdU+GHEGHv2/Gl9zNHrOKOh/t5vQX8dt7d+JeC19PDo2yr1+NHEG3i28+m8m8f6//jpnbAzkfsNr15eqfR/1+z/tfxP/Fvj/mFX/0dD/7pz0fsR69p8rmHv20D9vl5mZ1flb67VkP81pT/8QPialmT1z/5f2QK/7v7Q/6Z/vb6F0DvToXzuf1PvDv4Nn/4s4+mujvzb6a6O/Nvpro782+mujvzb6a6O/Nvpro782+mujvzb6a6O/Nvpro782+mujvzb6a6O/tvg/UN4t6E9/+tO/d3+s1/8HUhSy6A==
+   eJzt201uwjAQhuEIxCY7KugeqTepumHXC/T+xyCqYimy4sQ4E2bE9y6eDf+e1w4bOHZddwQAAAAAAAAAAACAF/jBP+8Onv29P4M35Rkor50ZaK+dGWivnRlor50ZtK39UmnL5/owegz94/X/on8Ykfsv9V27n/72a0/drPqfBucZeeMSjxm8m5b+W1m9Dv3fv//c9eG88f3p397fytr1vNR9j31A/1hq21vtg4gziNz/ZvQY+vubrr0fefdv3QOt+0O9/3cm3ZffntwqlZ4fTZqBdwuv/odROv9/g3vBwUDpjFq8dst7q5//vP/0O2B6m1V/T/Qv979nvedY9/jcwTPXHPov9+lXZldjrb/1fqL/c/2vo6W5bTn/S3tg7/Nfsz/pX+5v+Z1L/3i8f3cdhXcHz/6/4uivjf7a6K+N/tror43+2uivjf7a6K+N/tror43+2uivjf7a6K+N/tror43+2uivjf7a6K+N/trSf6C8W9Cf/vSn/6v7Y7/+Dyz1uAA=
   </data>
  </layer>
  <objectgroup id="1" name="PlayerStartingPos">
-  <object id="135" x="840" y="530">
+  <object id="135" x="1400" y="580">
    <point/>
   </object>
-  <object id="137" x="959" y="532">
+  <object id="137" x="1500" y="580">
    <point/>
   </object>
  </objectgroup>
@@ -64,7 +64,7 @@
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="60" x="1232" y="432" width="208" height="16">
+  <object id="60" x="1232" y="448" width="208" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
@@ -99,7 +99,7 @@
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="90" x="1232" y="496" width="320" height="16">
+  <object id="90" x="1248" y="464" width="320" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
@@ -114,37 +114,37 @@
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="100" x="1552" y="576" width="128" height="16">
+  <object id="100" x="1538" y="560" width="144" height="32">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="101" x="1568" y="560" width="112" height="16">
+  <object id="101" x="1568" y="528" width="112" height="32">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="102" x="1584" y="544" width="96" height="16">
+  <object id="102" x="1136" y="368" width="96" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="103" x="1600" y="528" width="80" height="16">
+  <object id="103" x="1600" y="496" width="80" height="32">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="104" x="768" y="382" width="304" height="16">
+  <object id="104" x="816" y="414" width="304" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="105" x="768" y="302" width="16" height="96">
+  <object id="105" x="816" y="366" width="16" height="64">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="106" x="1056" y="302" width="16" height="96">
+  <object id="106" x="1104" y="334" width="16" height="96">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>
@@ -164,42 +164,7 @@
     <property name="boundary_type" value="barrier"/>
    </properties>
   </object>
-  <object id="120" x="736" y="512" width="16" height="16">
-   <properties>
-    <property name="boundary_type" value="barrier"/>
-   </properties>
-  </object>
-  <object id="121" x="736" y="336" width="16" height="16">
-   <properties>
-    <property name="boundary_type" value="barrier"/>
-   </properties>
-  </object>
-  <object id="125" x="688" y="448" width="16" height="16">
-   <properties>
-    <property name="boundary_type" value="barrier"/>
-   </properties>
-  </object>
-  <object id="127" x="1088" y="320" width="16" height="16">
-   <properties>
-    <property name="boundary_type" value="barrier"/>
-   </properties>
-  </object>
-  <object id="128" x="1120" y="336" width="16" height="16">
-   <properties>
-    <property name="boundary_type" value="barrier"/>
-   </properties>
-  </object>
-  <object id="129" x="1136" y="368" width="16" height="16">
-   <properties>
-    <property name="boundary_type" value="barrier"/>
-   </properties>
-  </object>
-  <object id="130" x="1168" y="384" width="16" height="16">
-   <properties>
-    <property name="boundary_type" value="barrier"/>
-   </properties>
-  </object>
-  <object id="132" x="1184" y="416" width="16" height="16">
+  <object id="136" x="1232" y="432" width="208" height="16">
    <properties>
     <property name="boundary_type" value="barrier"/>
    </properties>

frontend/assets/resources/pbfiles/room_downsync_frame.proto

@@ -9,9 +9,9 @@ message PlayerDownsync {
   int32 virtualGridX = 2;
   int32 virtualGridY = 3;
   int32 dirX = 4;
-  int32 dirY = 5; // "dirX" and "dirY" determines character facing  
+  int32 dirY = 5;   
   int32 velX = 6;
-  int32 velY = 7; // "velX" and "velY" is used to record the accumulated effect by accelerations (including gravity)
+  int32 velY = 7; // "velX" and "velY" is used to record the accumulated effect by inertia and accelerations (including gravity)
   int32 speed = 8; // this is the instantaneous scalar attribute of a character, different from but will be accounted in "velX" and "velY" 
   int32 battleState = 9;
   int32 joinIndex = 10;
@@ -36,6 +36,8 @@ message PlayerDownsync {
   int32 onWallNormX = 27;
   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"
+
   string name = 997;
   string displayName = 998;
   string avatar = 999;
@@ -51,6 +53,7 @@ message InputFrameDecoded {
 message InputFrameUpsync {
   int32 inputFrameId = 1;
   uint64 encoded = 2;
+  int32 joinIndex = 3;
 }
 
 message InputFrameDownsync {
@@ -70,17 +73,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 authKey = 7;
+  repeated InputFrameUpsync inputFrameUpsyncBatch = 8;
+  HeartbeatUpsync hb = 9;
 }
 
 message InputsBufferSnapshot {
@@ -88,6 +83,7 @@ message InputsBufferSnapshot {
   uint64 unconfirmedMask = 2;
   repeated InputFrameDownsync toSendInputFrameDownsyncs = 3;
   bool shouldForceResync = 4;
+  int32 peerJoinIndex = 5;
 }
 
 message MeleeBullet {
@@ -170,6 +166,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;
 
@@ -186,6 +194,8 @@ message BattleColliderInfo {
   double spaceOffsetX = 11;
   double spaceOffsetY = 12;
   int32 collisionMinStep = 13;
+  int32 boundRoomCapacity = 14;
+  PeerUdpAddr battleUdpTunnel = 15;
 
   bool frameDataLoggingEnabled = 1024;
 }
@@ -202,4 +212,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

@@ -482,6 +482,13 @@
       },
       {
         "__uuid__": "e8247e2a-1b5b-4618-86f8-224b25246b55"
+      },
+      null,
+      null,
+      null,
+      null,
+      {
+        "__uuid__": "6e1139d4-03dd-4bd4-9510-606e94f629fe"
       }
     ],
     "playOnLoad": false,
@@ -653,6 +660,9 @@
       },
       {
         "__uuid__": "411f964a-4dd8-424c-b2e2-d92b10474ce2"
+      },
+      {
+        "__uuid__": "e906322d-a08b-4477-a2e9-98acd42fa034"
       }
     ],
     "playOnLoad": false,
@@ -822,6 +832,11 @@
       },
       {
         "__uuid__": "0abbd156-980e-475e-9994-3c958bd913fc"
+      },
+      null,
+      null,
+      {
+        "__uuid__": "edd23b2f-1caa-4836-88a7-e4af1f26743e"
       }
     ],
     "playOnLoad": false,

frontend/assets/resources/prefabs/CountdownToBeginGame.prefab

@@ -8,7 +8,8 @@
       "__id__": 1
     },
     "optimizationPolicy": 0,
-    "asyncLoadAssets": false
+    "asyncLoadAssets": false,
+    "readonly": false
   },
   {
     "__type__": "cc.Node",
@@ -27,20 +28,19 @@
       },
       {
         "__id__": 11
+      },
+      {
+        "__id__": 14
       }
     ],
     "_active": true,
-    "_level": 1,
     "_components": [
       {
-        "__id__": 14
-      },
-      {
-        "__id__": 15
+        "__id__": 17
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 18
     },
     "_opacity": 255,
     "_color": {
@@ -52,25 +52,14 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1024,
-      "height": 1920
+      "width": 960,
+      "height": 640
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
       "y": 0.5
     },
-    "_quat": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "groupIndex": 0,
-    "_id": "",
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
@@ -86,18 +75,29 @@
         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": "WhiteStars",
+    "_name": "Background",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
     },
     "_children": [],
     "_active": true,
-    "_level": 2,
     "_components": [
       {
         "__id__": 3
@@ -109,37 +109,26 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
+      "r": 0,
+      "g": 163,
       "b": 255,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 268,
-      "height": 112
+      "width": 1920,
+      "height": 1280
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
       "y": 0.5
     },
-    "_quat": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "groupIndex": 0,
-    "_id": "",
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -16,
+        0,
         0,
         0,
         0,
@@ -150,7 +139,19 @@
         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",
@@ -160,11 +161,18 @@
       "__id__": 2
     },
     "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "1a2d934e-9d6d-45bf-83c6-564586cc8400"
+      "__uuid__": "637f31c2-c53e-4dec-ae11-d56c0c6177ad"
     },
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -174,12 +182,9 @@
     "_fillStart": 0,
     "_fillRange": 0,
     "_isTrimmedMode": true,
-    "_state": 0,
     "_atlas": {
       "__uuid__": "030d9286-e8a2-40cf-98f8-baf713f0b8c4"
     },
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
     "_id": ""
   },
   {
@@ -190,7 +195,7 @@
     "asset": {
       "__uuid__": "230eeb1f-e0f9-4a41-ab6c-05b3771cbf3e"
     },
-    "fileId": "50Mjaee6xFXLrZ/mSBD3P5",
+    "fileId": "83iQr+5XNNF5E2qjV+WUp0",
     "sync": false
   },
   {
@@ -202,7 +207,6 @@
     },
     "_children": [],
     "_active": true,
-    "_level": 3,
     "_components": [
       {
         "__id__": 6
@@ -229,17 +233,6 @@
       "x": 0.5,
       "y": 0.5
     },
-    "_quat": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "groupIndex": 0,
-    "_id": "",
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
@@ -255,7 +248,19 @@
         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",
@@ -265,6 +270,13 @@
       "__id__": 5
     },
     "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
     "_spriteFrame": {
       "__uuid__": "75a2c1e3-2c22-480c-9572-eb65f4a554e1"
     },
@@ -279,12 +291,9 @@
     "_fillStart": 0,
     "_fillRange": 0,
     "_isTrimmedMode": true,
-    "_state": 0,
     "_atlas": {
       "__uuid__": "030d9286-e8a2-40cf-98f8-baf713f0b8c4"
     },
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
     "_id": ""
   },
   {
@@ -307,7 +316,6 @@
     },
     "_children": [],
     "_active": true,
-    "_level": 2,
     "_components": [
       {
         "__id__": 9
@@ -327,24 +335,13 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 111.23,
-      "height": 200
+      "height": 252
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
       "y": 0.5
     },
-    "_quat": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "groupIndex": 0,
-    "_id": "",
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
@@ -360,7 +357,19 @@
         0.66667,
         0.66667
       ]
-    }
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
   },
   {
     "__type__": "cc.Label",
@@ -370,6 +379,11 @@
       "__id__": 8
     },
     "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
     "_useOriginalSize": false,
     "_string": "3",
     "_N$string": "3",
@@ -407,7 +421,6 @@
     },
     "_children": [],
     "_active": true,
-    "_level": 2,
     "_components": [
       {
         "__id__": 12
@@ -434,17 +447,6 @@
       "x": 0.5,
       "y": 0.5
     },
-    "_quat": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "groupIndex": 0,
-    "_id": "",
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
@@ -460,7 +462,19 @@
         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",
@@ -470,6 +484,13 @@
       "__id__": 11
     },
     "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
     "_spriteFrame": {
       "__uuid__": "637f31c2-c53e-4dec-ae11-d56c0c6177ad"
     },
@@ -484,12 +505,9 @@
     "_fillStart": 0,
     "_fillRange": 0,
     "_isTrimmedMode": true,
-    "_state": 0,
     "_atlas": {
       "__uuid__": "030d9286-e8a2-40cf-98f8-baf713f0b8c4"
     },
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
     "_id": ""
   },
   {
@@ -503,6 +521,115 @@
     "fileId": "21dxpL7zlKIIDhUt+GIMbg",
     "sync": false
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "WhiteStars",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 15
+      }
+    ],
+    "_prefab": {
+      "__id__": 16
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 268,
+      "height": 112
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -16,
+        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__": 14
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "1a2d934e-9d6d-45bf-83c6-564586cc8400"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": {
+      "__uuid__": "030d9286-e8a2-40cf-98f8-baf713f0b8c4"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "230eeb1f-e0f9-4a41-ab6c-05b3771cbf3e"
+    },
+    "fileId": "50Mjaee6xFXLrZ/mSBD3P5",
+    "sync": false
+  },
   {
     "__type__": "6a3d6Y6Ki1BiqAVSKIRdwRl",
     "_name": "",
@@ -516,34 +643,6 @@
     },
     "_id": ""
   },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "_spriteFrame": {
-      "__uuid__": "334d4f93-b007-49e8-9268-35891d4f4ebb"
-    },
-    "_type": 0,
-    "_sizeMode": 1,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_state": 0,
-    "_atlas": null,
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_id": ""
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

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

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.5",
-  "uuid": "3ed4c7bc-79d0-4075-a563-d5a58ae798f9",
+  "uuid": "dc804c5c-ff76-445e-ac69-52269055c3c5",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

frontend/assets/resources/prefabs/GameRule.prefab

@@ -21,20 +21,20 @@
         "__id__": 2
       },
       {
-        "__id__": 10
+        "__id__": 5
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 13
+        "__id__": 12
       },
       {
-        "__id__": 14
+        "__id__": 13
       }
     ],
     "_prefab": {
-      "__id__": 15
+      "__id__": 14
     },
     "_opacity": 255,
     "_color": {
@@ -46,8 +46,72 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1024,
-      "height": 1920
+      "width": 960,
+      "height": 640
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        480,
+        320,
+        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": "Background",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      }
+    ],
+    "_prefab": {
+      "__id__": 4
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 1920,
+      "height": 1280
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -83,6 +147,51 @@
     "groupIndex": 0,
     "_id": ""
   },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_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": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "32b8e752-8362-4783-a4a6-1160af8b7109"
+    },
+    "fileId": "a7oR1cZvVO/pp9QJgLnJyt",
+    "sync": false
+  },
   {
     "__type__": "cc.Node",
     "_name": "modeButton",
@@ -92,20 +201,20 @@
     },
     "_children": [
       {
-        "__id__": 3
+        "__id__": 6
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 7
+        "__id__": 9
       },
       {
-        "__id__": 8
+        "__id__": 10
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 11
     },
     "_opacity": 255,
     "_color": {
@@ -117,8 +226,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 280,
-      "height": 130
+      "width": 240,
+      "height": 100
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -130,7 +239,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -564,
+        -90.495,
         0,
         0,
         0,
@@ -159,20 +268,17 @@
     "_name": "Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 5
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 4
-      },
-      {
-        "__id__": 5
+        "__id__": 7
       }
     ],
     "_prefab": {
-      "__id__": 6
+      "__id__": 8
     },
     "_opacity": 255,
     "_color": {
@@ -226,7 +332,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 3
+      "__id__": 6
     },
     "_enabled": true,
     "_materials": [
@@ -235,8 +341,8 @@
       }
     ],
     "_useOriginalSize": false,
-    "_string": "gameRule.mode",
-    "_N$string": "gameRule.mode",
+    "_string": "1 v 1",
+    "_N$string": "1 v 1",
     "_fontSize": 55,
     "_lineHeight": 50,
     "_enableWrapText": false,
@@ -251,17 +357,6 @@
     "_N$cacheMode": 0,
     "_id": ""
   },
-  {
-    "__type__": "744dcs4DCdNprNhG0xwq6FK",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 3
-    },
-    "_enabled": true,
-    "_dataID": "gameRule.mode",
-    "_id": ""
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -278,7 +373,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2
+      "__id__": 5
     },
     "_enabled": true,
     "_materials": [
@@ -312,7 +407,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2
+      "__id__": 5
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -375,7 +470,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 2
+      "__id__": 5
     },
     "_id": ""
   },
@@ -390,115 +485,6 @@
     "fileId": "c54lqSflFD8ogSYAhsAkKh",
     "sync": false
   },
-  {
-    "__type__": "cc.Node",
-    "_name": "decoration",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 11
-      }
-    ],
-    "_prefab": {
-      "__id__": 12
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 543,
-      "height": 117
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        0,
-        -312,
-        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__": 10
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "153d890a-fc37-4d59-8779-93a8fb19fa85"
-    },
-    "_type": 0,
-    "_sizeMode": 1,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": {
-      "__uuid__": "030d9286-e8a2-40cf-98f8-baf713f0b8c4"
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "32b8e752-8362-4783-a4a6-1160af8b7109"
-    },
-    "fileId": "1bbMLAzntHZpEudL8lM/Lx",
-    "sync": false
-  },
   {
     "__type__": "dd92bKVy8FJY7uq3ieoNZCZ",
     "_name": "",
@@ -508,41 +494,36 @@
     },
     "_enabled": true,
     "modeButton": {
-      "__id__": 8
+      "__id__": 10
     },
     "mapNode": null,
     "_id": ""
   },
   {
-    "__type__": "cc.Sprite",
+    "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
     "node": {
       "__id__": 1
     },
     "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "7838f276-ab48-445a-b858-937dd27d9520"
-    },
-    "_type": 0,
-    "_sizeMode": 0,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 18,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
     "_id": ""
   },
   {

frontend/assets/resources/prefabs/Loading.prefab

@@ -8,7 +8,8 @@
       "__id__": 1
     },
     "optimizationPolicy": 0,
-    "asyncLoadAssets": false
+    "asyncLoadAssets": false,
+    "readonly": false
   },
   {
     "__type__": "cc.Node",
@@ -20,18 +21,17 @@
         "__id__": 2
       },
       {
-        "__id__": 6
+        "__id__": 5
       }
     ],
     "_active": true,
-    "_level": 1,
     "_components": [
       {
-        "__id__": 9
+        "__id__": 8
       }
     ],
     "_prefab": {
-      "__id__": 10
+      "__id__": 9
     },
     "_opacity": 255,
     "_color": {
@@ -51,24 +51,12 @@
       "x": 0.5,
       "y": 0.5
     },
-    "_quat": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_zIndex": 0,
-    "groupIndex": 0,
-    "_id": "",
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        512,
-        0,
+        480,
+        480,
         0,
         0,
         0,
@@ -78,7 +66,19 @@
         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",
@@ -89,17 +89,13 @@
     },
     "_children": [],
     "_active": true,
-    "_level": 0,
     "_components": [
       {
         "__id__": 3
-      },
-      {
-        "__id__": 4
       }
     ],
     "_prefab": {
-      "__id__": 5
+      "__id__": 4
     },
     "_opacity": 255,
     "_color": {
@@ -111,32 +107,20 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 303.5,
-      "height": 30
+      "width": 805.7,
+      "height": 35.28
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0.5,
       "y": 0.5
     },
-    "_quat": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_zIndex": 0,
-    "groupIndex": 0,
-    "_id": "",
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
         0,
-        210,
+        -150,
         0,
         0,
         0,
@@ -146,7 +130,19 @@
         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.Label",
@@ -156,32 +152,26 @@
       "__id__": 2
     },
     "_enabled": true,
-    "_srcBlendFactor": 1,
-    "_dstBlendFactor": 771,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
     "_useOriginalSize": false,
-    "_string": "login.tips.loginSuccess",
-    "_N$string": "login.tips.loginSuccess",
-    "_fontSize": 30,
-    "_lineHeight": 30,
+    "_string": "Logged in successfully, loading game resources...",
+    "_N$string": "Logged in successfully, loading game resources...",
+    "_fontSize": 28,
+    "_lineHeight": 28,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
+    "_batchAsBitmap": false,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "744dcs4DCdNprNhG0xwq6FK",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "_dataID": "login.tips.loginSuccess",
+    "_N$overflow": 3,
+    "_N$cacheMode": 0,
     "_id": ""
   },
   {
@@ -204,14 +194,13 @@
     },
     "_children": [],
     "_active": true,
-    "_level": 0,
     "_components": [
       {
-        "__id__": 7
+        "__id__": 6
       }
     ],
     "_prefab": {
-      "__id__": 8
+      "__id__": 7
     },
     "_opacity": 255,
     "_color": {
@@ -231,24 +220,12 @@
       "x": 0.5,
       "y": 0.5
     },
-    "_quat": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_zIndex": 0,
-    "groupIndex": 0,
-    "_id": "",
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
         0,
-        333,
+        0,
         0,
         0,
         0,
@@ -258,16 +235,29 @@
         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__": 6
+      "__id__": 5
     },
     "_enabled": true,
+    "_materials": [],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": null,
@@ -282,7 +272,6 @@
     "_fillStart": 0,
     "_fillRange": 0,
     "_isTrimmedMode": true,
-    "_state": 0,
     "_atlas": null,
     "_id": ""
   },
@@ -307,7 +296,7 @@
     "_enabled": true,
     "alignMode": 0,
     "_target": null,
-    "_alignFlags": 20,
+    "_alignFlags": 18,
     "_left": 0,
     "_right": 0,
     "_top": 0,

frontend/assets/resources/textures/MiniGame_Background.png.meta

@@ -1,34 +0,0 @@
-{
-  "ver": "2.3.3",
-  "uuid": "825df908-a4cb-449d-9731-8ef53f3fd44f",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "platformSettings": {},
-  "subMetas": {
-    "MiniGame_Background": {
-      "ver": "1.0.4",
-      "uuid": "7838f276-ab48-445a-b858-937dd27d9520",
-      "rawTextureUuid": "825df908-a4cb-449d-9731-8ef53f3fd44f",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 750,
-      "height": 1624,
-      "rawWidth": 750,
-      "rawHeight": 1624,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

frontend/assets/resources/textures/MiniGame_Blackboard.png.meta

@@ -1,34 +0,0 @@
-{
-  "ver": "2.3.3",
-  "uuid": "94b8bb09-e8ac-4402-a933-b79f01b5a813",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "platformSettings": {},
-  "subMetas": {
-    "MiniGame_Blackboard": {
-      "ver": "1.0.4",
-      "uuid": "334d4f93-b007-49e8-9268-35891d4f4ebb",
-      "rawTextureUuid": "94b8bb09-e8ac-4402-a933-b79f01b5a813",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 1024,
-      "height": 1920,
-      "rawWidth": 1024,
-      "rawHeight": 1920,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

frontend/assets/scripts/AttackingCharacter.js

@@ -18,6 +18,7 @@ window.ATK_CHARACTER_STATE = {
   Atk5: [14, "Atk5"],
   Dashing: [15, "Dashing"],
   OnWall: [16, "OnWall"],
+  TurnAround1: [17, "TurnAround1"],
 };
 
 window.ATK_CHARACTER_STATE_ARR = [];
@@ -74,10 +75,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;
   },
 
@@ -93,7 +94,7 @@ cc.Class({
       } else if (0 < rdfPlayer.DirX) {
         this.animNode.scaleX = (+1.0);
       }
-      if (ATK_CHARACTER_STATE.OnWall[0] == newCharacterState) {
+      if (ATK_CHARACTER_STATE.OnWall[0] == newCharacterState || ATK_CHARACTER_STATE.TurnAround1[0] == newCharacterState) {
         if (0 < rdfPlayer.OnWallNormX) {
           this.animNode.scaleX = (-1.0);
         } else {
@@ -106,13 +107,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)) {
@@ -121,11 +122,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/FindingPlayer.js

@@ -14,10 +14,6 @@ cc.Class({
       type: cc.Node,
       default: null
     },
-    myAvatarNode: {
-      type: cc.Node,
-      default: null
-    },
     exitBtnNode: {
       type: cc.Node,
       default: null
@@ -25,10 +21,10 @@ cc.Class({
   },
 
   // LIFE-CYCLE CALLBACKS:
-  onLoad() {
-  },
+  onLoad() {},
 
-  init() {
+  init(mapIns) {
+    this.mapIns = mapIns;
     if (null != this.firstPlayerInfoNode) {
       this.firstPlayerInfoNode.active = false;
     }
@@ -58,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) {
@@ -70,29 +67,20 @@ cc.Class({
       const playerInfoNode = this.playersInfoNode[playerMeta.joinIndex];
       if (null == playerInfoNode) {
         cc.error("There's no playerInfoNode for joinIndex == ", joinIndex, ", as `this.playerInfoNode` is currently ", this.playersInfoNode);
-      } 
+      }
       playerInfoNode.active = true;
       if (2 == playerMeta.joinIndex) {
-        if (null != this.findingAnimNode) { 
+        if (null != this.findingAnimNode) {
           this.findingAnimNode.active = false;
         }
       }
     }
 
-    //显示自己的头像名称以及他人的头像名称
     for (let i in playerMetas) {
       const playerMeta = playerMetas[i];
       console.log("Showing playerMeta:", playerMeta);
       const playerInfoNode = this.playersInfoNode[playerMeta.joinIndex];
 
-      (() => { //远程加载头像
-        let remoteUrl = playerMeta.avatar;
-        if (remoteUrl == null || remoteUrl == '') {
-          cc.log(`No avatar to show for :`);
-          cc.log(playerMeta);
-        }
-      })();
-
       function isEmptyString(str) {
         return str == null || str == ''
       }

frontend/assets/scripts/Login.js

@@ -68,6 +68,8 @@ cc.Class({
   // LIFE-CYCLE CALLBACKS:
 
   onLoad() {
+    cc.view.setOrientation(cc.macro.ORIENTATION_AUTO);
+    cc.view.enableAutoFullScreen(true);
 
     window.atFirstLocationHref = window.location.href.split('#')[0];
     const self = this;

frontend/assets/scripts/Map.js

@@ -2,6 +2,7 @@ const i18n = require('LanguageData');
 i18n.init(window.language); // languageID should be equal to the one we input in New Language ID input field
 
 const RingBuffer = require('./RingBuffer');
+const NetworkDoctor = require('./NetworkDoctor');
 const PriorityQueue = require("./PriorityQueue");
 
 window.ALL_MAP_STATES = {
@@ -33,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 renderedInputFrameIdUpper = gopkgs.ConvertToDelayedInputFrameId(self.renderFrameId);
+      const peerJoinIndex = req.joinIndex;
+      const batch = req.inputFrameUpsyncBatch;
+      self.onPeerInputFrameUpsync(peerJoinIndex, batch);
+    }
+  }
+};
+
 cc.Class({
   extends: cc.Component,
 
@@ -96,16 +114,26 @@ cc.Class({
       type: cc.Integer,
       default: 4 // implies (renderFrameIdLagTolerance >> inputScaleFrames) count of inputFrameIds
     },
-    jigglingEps1D: {
-      type: cc.Float,
-      default: 1e-3
+    sendingQLabel: {
+      type: cc.Label,
+      default: null
     },
-    bulletTriggerEnabled: {
-      default: false
+    inputFrameDownsyncQLabel: {
+      type: cc.Label,
+      default: null
     },
-    closeOnForcedtoResyncNotSelf: {
-      default: true
+    peerInputFrameUpsyncQLabel: {
+      type: cc.Label,
+      default: null
     },
+    rollbackFramesLabel: {
+      type: cc.Label,
+      default: null
+    },
+    skippedRenderFrameCntLabel: {
+      type: cc.Label,
+      default: null
+    }
   },
 
   _inputFrameIdDebuggable(inputFrameId) {
@@ -184,6 +212,7 @@ cc.Class({
       // Upon resync, "self.lastUpsyncInputFrameId" might not have been updated properly.
       batchInputFrameIdSt = self.recentInputCache.StFrameId;
     }
+    self.networkDoctor.logSending(batchInputFrameIdSt, latestLocalInputFrameId);
     for (let i = batchInputFrameIdSt; i <= latestLocalInputFrameId; ++i) {
       const inputFrameDownsync = self.recentInputCache.GetByFrameId(i);
       if (null == inputFrameDownsync) {
@@ -205,7 +234,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) {
@@ -308,7 +341,7 @@ cc.Class({
       const newFireball = newFireballNode.getComponent("Fireball");
       newFireballNode.setPosition(cc.v2(Number.MAX_VALUE, Number.MAX_VALUE));
       safelyAddChild(self.node, newFireballNode);
-      setLocalZOrder(newFireballNode, 5);
+      setLocalZOrder(newFireballNode, 10);
       newFireball.lastUsed = -1;
       newFireball.bulletLocalId = -1;
       const initLookupKey = -(k + 1); // there's definitely no suck "bulletLocalId"
@@ -324,7 +357,6 @@ cc.Class({
 
     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);
@@ -342,14 +374,13 @@ cc.Class({
     self.othersForcedDownsyncRenderFrameDict = new Map();
     self.rdfIdToActuallyUsedInput = new Map();
 
+    self.networkDoctor = new NetworkDoctor(20);
+    self.skipRenderFrameFlag = false;
+
     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);
     }
@@ -409,11 +440,16 @@ cc.Class({
   },
 
   onLoad() {
+    cc.game.setFrameRate(60);
+    cc.view.setOrientation(cc.macro.ORIENTATION_LANDSCAPE);
+    cc.view.enableAutoFullScreen(true);
+
     const self = this;
     window.mapIns = self;
     window.forceBigEndianFloatingNumDecoding = self.forceBigEndianFloatingNumDecoding;
 
     self.showCriticalCoordinateLabels = false;
+    self.showNetworkDoctorInfo = true;
 
     console.warn("+++++++ Map onLoad()");
 
@@ -451,7 +487,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);
 
@@ -473,7 +509,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.tooFastDtIntervalMillis = 0.5 * self.rollbackEstimatedDtMillis;
+      self.inputFrameUpsyncDelayTolerance = parsedBattleColliderInfo.inputFrameUpsyncDelayTolerance;
 
       const tiledMapIns = self.node.getComponent(cc.TiledMap);
 
@@ -481,7 +517,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;
         }
 
@@ -530,10 +566,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(),
@@ -607,7 +639,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.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);
       jsPlayersArr[k] = jsPlayer;
     }
     const jsMeleeBulletsArr = new Array(pbRdf.meleeBullets.length).fill(null);
@@ -688,6 +720,7 @@ cc.Class({
       self.lastRenderFrameIdTriggeredAt = performance.now();
       // In this case it must be true that "rdf.id > chaserRenderFrameId".
       self.chaserRenderFrameId = rdf.Id;
+      self.networkDoctor.logRollbackFrames(0);
 
       const canvasNode = self.canvasNode;
       self.ctrl = canvasNode.getComponent("TouchEventsManager");
@@ -794,6 +827,7 @@ cc.Class({
       return;
     }
 
+    self.networkDoctor.logInputFrameDownsync(batch[0].inputFrameId, batch[batch.length - 1].inputFrameId);
     let firstPredictedYetIncorrectInputFrameId = null;
     for (let k in batch) {
       const inputFrameDownsync = batch[k];
@@ -837,11 +871,60 @@ cc.Class({
     --------------------------------------------------------
     */
     // The actual rollback-and-chase would later be executed in update(dt). 
-    console.warn(`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}]`);
     self.chaserRenderFrameId = renderFrameId1;
+    self.networkDoctor.logRollbackFrames(self.renderFrameId - self.chaserRenderFrameId);
+  },
+
+  onPeerInputFrameUpsync(peerJoinIndex, batch /* []*pb.InputFrameDownsync */ ) {
+    // TODO: find some kind of synchronization mechanism against "getOrPrefabInputFrameUpsync"!
+    // See `<proj-root>/ConcerningEdgeCases.md` for why this method exists.
+    if (null == batch) {
+      return;
+    }
+    const self = this;
+    if (!self.recentInputCache) {
+      return;
+    }
+    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`);
+    const renderedInputFrameIdUpper = gopkgs.ConvertToDelayedInputFrameId(self.renderFrameId);
+    for (let k in batch) {
+      const inputFrameDownsync = batch[k];
+      const inputFrameDownsyncId = inputFrameDownsync.inputFrameId;
+      if (inputFrameDownsyncId < renderedInputFrameIdUpper) {
+        // Avoid obfuscating already rendered history
+        continue;
+      }
+      if (inputFrameDownsyncId <= self.lastAllConfirmedInputFrameId) {
+        continue;
+      }
+      self.getOrPrefabInputFrameUpsync(inputFrameDownsyncId); // Make sure that inputFrame exists locally
+      const existingInputFrame = self.recentInputCache.GetByFrameId(inputFrameDownsyncId);
+      if (0 < (existingInputFrame.ConfirmedList & (1 << (peerJoinIndex - 1)))) {
+        continue;
+      }
+      effCnt += 1;
+      // the returned "gopkgs.NewInputFrameDownsync.InputList" is immutable, thus we can only modify the values in "newInputList" and "newConfirmedList"!
+      let newInputList = new Array(self.playerRichInfoDict.size).fill(0);
+      for (let i in existingInputFrame.InputList) {
+        newInputList[i] = existingInputFrame.InputList[i];
+      }
+      let newConfirmedList = (existingInputFrame.confirmedList | (1 << (peerJoinIndex - 1)));
+      // No need to change "lastAllConfirmedInputFrameId", leave it to "onInputFrameDownsyncBatch" -- we're just helping prediction here
+      const newInputFrameDownsyncLocal = gopkgs.NewInputFrameDownsync(inputFrameDownsyncId, newInputList, newConfirmedList);
+      self.recentInputCache.SetByFrameId(newInputFrameDownsyncLocal, inputFrameDownsyncId);
+    }
+    if (0 < effCnt) {
+      self.networkDoctor.logPeerInputFrameUpsync(batch[0].inputFrameId, batch[batch.length - 1].inputFrameId);
+    }
   },
 
   onPlayerAdded(rdf /* pb.RoomDownsyncFrame */ ) {
@@ -860,7 +943,7 @@ batchInputFrameIdRange=[${batch[0].inputFrameId}, ${batch[batch.length - 1].inpu
       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) {
@@ -908,10 +991,16 @@ batchInputFrameIdRange=[${batch[0].inputFrameId}, ${batch[batch.length - 1].inpu
   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);
+      /*
+      [WARNING] Different devices might differ in the rate of calling "update(dt)", and the game engine is responsible of keeping this rate statistically constant. 
+
+      Significantly different rates of calling "update(dt)" among players in a same battle would result in frequent [type#1 forceConfirmation], if you have any doubt on troubles caused by this, sample the FPS curve from all players in that battle. 
+
+      Kindly note that Significantly different network bandwidths or delay fluctuations would result in frequent [type#1 forceConfirmation] too, but CAUSE FROM DIFFERENT LOCAL "update(dt)" RATE SHOULD BE THE FIRST TO INVESTIGATE AND ELIMINATE -- because we have control on it, but no one has control on the internet. 
+      */
+      if (self.skipRenderFrameFlag) {
+        self.networkDoctor.logSkippedRenderFrameCnt();
+        self.skipRenderFrameFlag = false;
         return;
       }
       try {
@@ -925,7 +1014,7 @@ batchInputFrameIdRange=[${batch[0].inputFrameId}, ${batch[batch.length - 1].inpu
 
         const delayedInputFrameId = gopkgs.ConvertToDelayedInputFrameId(self.renderFrameId);
         if (null == self.recentInputCache.GetByFrameId(delayedInputFrameId)) {
-          // Possible edge case after resync
+          // 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);
         }
 
@@ -950,6 +1039,7 @@ 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 prevRdf = latestRdfResults[0],
           rdf = latestRdfResults[1];
         /*
@@ -974,9 +1064,13 @@ othersForcedDownsyncRenderFrame=${JSON.stringify(othersForcedDownsyncRenderFrame
         }
         self.applyRoomDownsyncFrameDynamics(rdf, prevRdf);
         self.showDebugBoundaries(rdf);
+        if (self.showNetworkDoctorInfo) {
+          self.showNetworkDoctorLabels();
+        }
         ++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();
       } catch (err) {
         console.error("Error during Map.update", err);
         self.onBattleStopped(); // TODO: Popup to ask player to refresh browser
@@ -1000,6 +1094,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);
     }
 
@@ -1202,24 +1297,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();
@@ -1265,7 +1342,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();
       }
     }
@@ -1468,4 +1545,44 @@ actuallyUsedinputList:{${self.inputFrameDownsyncStr(actuallyUsedInputClone)}}`);
       }
     }
   },
+
+  showNetworkDoctorLabels() {
+    const self = this;
+    const [sendingFps, srvDownsyncFps, peerUpsyncFps, rollbackFrames, skippedRenderFrameCnt] = self.networkDoctor.stats();
+    if (self.sendingQLabel) {
+      self.sendingQLabel.string = `${sendingFps} fps sending`;
+      if (sendingFps < self.networkDoctor.inputRateThreshold) {
+        self.sendingQLabel.node.color = cc.Color.RED;
+      } else {
+        self.sendingQLabel.node.color = cc.Color.WHITE;
+      }
+    }
+    if (self.inputFrameDownsyncQLabel) {
+      self.inputFrameDownsyncQLabel.string = `${srvDownsyncFps} fps srv-downsync`;
+      if (srvDownsyncFps < self.networkDoctor.inputRateThreshold) {
+        self.inputFrameDownsyncQLabel.node.color = cc.Color.RED;
+      } else {
+        self.inputFrameDownsyncQLabel.node.color = cc.Color.WHITE;
+      }
+    }
+    if (self.peerInputFrameUpsyncQLabel) {
+      self.peerInputFrameUpsyncQLabel.string = `${peerUpsyncFps} fps peer-upsync`;
+      if (peerUpsyncFps > self.networkDoctor.peerUpsyncFps) {
+        self.peerInputFrameUpsyncQLabel.node.color = cc.Color.RED;
+      } else {
+        self.peerInputFrameUpsyncQLabel.node.color = cc.Color.WHITE;
+      }
+    }
+    if (self.rollbackFramesLabel) {
+      self.rollbackFramesLabel.string = `rollbackFrames: ${rollbackFrames}`
+      if (rollbackFrames > self.networkDoctor.rollbackFramesThreshold) {
+        self.rollbackFramesLabel.node.color = cc.Color.RED;
+      } else {
+        self.rollbackFramesLabel.node.color = cc.Color.WHITE;
+      }
+    }
+    if (self.skippedRenderFrameCntLabel) {
+      self.skippedRenderFrameCntLabel.string = `${skippedRenderFrameCnt} frames skipped`
+    }
+  },
 });

frontend/assets/scripts/NetworkDoctor.js

@@ -0,0 +1,98 @@
+const RingBuffer = require('./RingBuffer');
+
+var NetworkDoctor = function(capacity) {
+  this.reset(capacity);
+};
+
+NetworkDoctor.prototype.reset = function(capacity) {
+  this.sendingQ = new RingBuffer(capacity);
+  this.inputFrameDownsyncQ = new RingBuffer(capacity);
+  this.peerInputFrameUpsyncQ = new RingBuffer(capacity);
+  this.peerInputFrameUpsyncCnt = 0;
+  this.immediateRollbackFrames = 0;
+  this.skippedRenderFrameCnt = 0;
+
+  this.inputRateThreshold = gopkgs.ConvertToNoDelayInputFrameId(60);
+  this.peerUpsyncThreshold = 8;
+  this.rollbackFramesThreshold = 8; // Roughly the minimum "TurnAroundFramesToRecover".
+};
+
+NetworkDoctor.prototype.logSending = function(stFrameId, edFrameId) {
+  this.sendingQ.put({
+    i: stFrameId,
+    j: edFrameId,
+    t: Date.now()
+  });
+};
+
+NetworkDoctor.prototype.logInputFrameDownsync = function(stFrameId, edFrameId) {
+  this.inputFrameDownsyncQ.put({
+    i: stFrameId,
+    j: edFrameId,
+    t: Date.now()
+  });
+};
+
+NetworkDoctor.prototype.logPeerInputFrameUpsync = function(stFrameId, edFrameId) {
+  const firstPopped = this.peerInputFrameUpsyncQ.put({
+    i: stFrameId,
+    j: edFrameId,
+    t: Date.now()
+  });
+  if (null != firstPopped) {
+    this.peerInputFrameUpsyncCnt -= (firstPopped.j - firstPopped.i + 1);
+  }
+  this.peerInputFrameUpsyncCnt += (edFrameId - stFrameId + 1);
+};
+
+NetworkDoctor.prototype.logRollbackFrames = function(x) {
+  this.immediateRollbackFrames = x;
+};
+
+NetworkDoctor.prototype.stats = function() {
+  let sendingFps = 0,
+    srvDownsyncFps = 0,
+    peerUpsyncFps = 0,
+    rollbackFrames = this.immediateRollbackFrames;
+  if (1 < this.sendingQ.cnt) {
+    const st = this.sendingQ.getByFrameId(this.sendingQ.stFrameId);
+    const ed = this.sendingQ.getByFrameId(this.sendingQ.edFrameId - 1);
+    const elapsedMillis = ed.t - st.t;
+    sendingFps = Math.round((ed.j - st.i) * 1000 / elapsedMillis);
+  }
+  if (1 < this.inputFrameDownsyncQ.cnt) {
+    const st = this.inputFrameDownsyncQ.getByFrameId(this.inputFrameDownsyncQ.stFrameId);
+    const ed = this.inputFrameDownsyncQ.getByFrameId(this.inputFrameDownsyncQ.edFrameId - 1);
+    const elapsedMillis = ed.t - st.t;
+    srvDownsyncFps = Math.round((ed.j - st.i) * 1000 / elapsedMillis);
+  }
+  if (1 < this.peerInputFrameUpsyncQ.cnt) {
+    const st = this.peerInputFrameUpsyncQ.getByFrameId(this.peerInputFrameUpsyncQ.stFrameId);
+    const ed = this.peerInputFrameUpsyncQ.getByFrameId(this.peerInputFrameUpsyncQ.edFrameId - 1);
+    const elapsedMillis = ed.t - st.t;
+    peerUpsyncFps = Math.round(this.peerInputFrameUpsyncCnt * 1000 / elapsedMillis);
+  }
+  return [sendingFps, srvDownsyncFps, peerUpsyncFps, rollbackFrames, this.skippedRenderFrameCnt];
+};
+
+NetworkDoctor.prototype.logSkippedRenderFrameCnt = function() {
+  this.skippedRenderFrameCnt += 1;
+}
+
+NetworkDoctor.prototype.isTooFast = function() {
+  return false;
+  const [sendingFps, srvDownsyncFps, peerUpsyncFps, rollbackFrames, skippedRenderFrameCnt] = this.stats();
+  if (sendingFps >= this.inputRateThreshold + 2) {
+    // Don't send too fast
+    return true;
+  } else if (sendingFps >= this.inputRateThreshold && srvDownsyncFps >= 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".  
+    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;
+    }
+  }
+  return false;
+};
+
+module.exports = NetworkDoctor;

frontend/assets/scripts/NetworkDoctor.js.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.5",
-  "uuid": "477c07c3-0d50-4d55-96f0-6eaf9f25e2da",
+  "uuid": "affd726a-02f0-4079-aace-39fe525d7478",
   "isPlugin": false,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

frontend/assets/scripts/OfflineMap.js

@@ -11,9 +11,13 @@ cc.Class({
   },
 
   onLoad() {
+    cc.game.setFrameRate(60);
+    cc.view.setOrientation(cc.macro.ORIENTATION_LANDSCAPE);
+    cc.view.enableAutoFullScreen(true);
     const self = this;
     window.mapIns = self;
     self.showCriticalCoordinateLabels = false;
+    self.showNetworkDoctorInfo = true;
 
     const mapNode = self.node;
     const canvasNode = mapNode.parent;
@@ -140,6 +144,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;
@@ -150,12 +183,6 @@ 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,

frontend/assets/scripts/ResultPanel.js

@@ -11,14 +11,6 @@ cc.Class({
       type: cc.Object,
       default: null
     },
-    myAvatarNode: {
-      type: cc.Node,
-      default: null,
-    },
-    myNameNode: {
-      type: cc.Node,
-      default: null,
-    },
     rankingNodes: {
       type: [cc.Node],
       default: [],
@@ -46,22 +38,6 @@ cc.Class({
 
   showPlayerInfo(playerRichInfoDict) {
     this.showRanking(playerRichInfoDict);
-    this.showMyAvatar();
-    this.showMyName();
-  },
-
-  showMyName() {
-    const selfPlayerInfo = JSON.parse(cc.sys.localStorage.getItem('selfPlayer'));
-    let name = 'No name';
-    if (null == selfPlayerInfo.displayName || "" == selfPlayerInfo.displayName) {
-      name = selfPlayerInfo.name;
-    } else {
-      name = selfPlayerInfo.displayName;
-    }
-    if (!this.myNameNode) return;
-    const myNameNodeLabel = this.myNameNode.getComponent(cc.Label);
-    if (!myNameNodeLabel || null == name) return;
-    myNameNodeLabel.string = name;
   },
 
   showRanking(playerRichInfoDict) {
@@ -115,42 +91,6 @@ cc.Class({
     } 
   },
 
-  showMyAvatar() {
-    const self = this;
-    const selfPlayerInfo = JSON.parse(cc.sys.localStorage.getItem('selfPlayer'));
-    let remoteUrl = selfPlayerInfo.avatar;
-    if (remoteUrl == null || remoteUrl == '') {
-      cc.log(`No avatar to show for myself, check storage.`);
-      return;
-    } else {
-      cc.loader.load({
-        url: remoteUrl,
-        type: 'jpg'
-      }, function(err, texture) {
-        if (err != null || texture == null) {
-          console.log(err);
-        } else {
-          const sf = new cc.SpriteFrame();
-          sf.setTexture(texture);
-          self.myAvatarNode.getComponent(cc.Sprite).spriteFrame = sf;
-        }
-      });
-    }
-  },
-
-  showRibbon(winnerInfo, ribbonNode) {
-    const selfPlayerInfo = JSON.parse(cc.sys.localStorage.getItem('selfPlayer'));
-    const texture = (selfPlayerInfo.playerId == winnerInfo.id) ? "textures/resultPanel/WinRibbon" : "textures/resultPanel/loseRibbon";
-    cc.loader.loadRes(texture, cc.SpriteFrame, function(err, spriteFrame) {
-      if (err) {
-        console.log(err);
-        return;
-      }
-      ribbonNode.getComponent(cc.Sprite).spriteFrame = spriteFrame;
-    });
-
-  },
-
   onClose(evt) {
     if (this.node.parent) {
       this.node.parent.removeChild(this.node);

frontend/assets/scripts/RingBuffer.js

@@ -13,9 +13,12 @@ var RingBuffer = function(capacity) {
 };
 
 RingBuffer.prototype.put = function(item) {
+  let firstPopped = null;
   while (0 < this.cnt && this.cnt >= this.n) {
     // Make room for the new element
-    this.pop();
+    const popped = this.pop();
+    if (null == firstPopped)
+      firstPopped = popped;
   }
   this.eles[this.ed] = item
   this.edFrameId++;
@@ -24,6 +27,7 @@ RingBuffer.prototype.put = function(item) {
   if (this.ed >= this.n) {
     this.ed -= this.n; // Deliberately not using "%" operator for performance concern
   }
+  return firstPopped;
 };
 
 RingBuffer.prototype.pop = function() {

frontend/assets/scripts/TouchEventsManager.js

@@ -169,30 +169,24 @@ cc.Class({
     if (self.btnA) {
       self.btnA.on(cc.Node.EventType.TOUCH_START, function(evt) {
         self._triggerEdgeBtnA(true);
-        evt.target.runAction(cc.scaleTo(0.1, 0.3));
       });
       self.btnA.on(cc.Node.EventType.TOUCH_END, function(evt) {
         self._triggerEdgeBtnA(false);
-        evt.target.runAction(cc.scaleTo(0.1, 1.0));
       });
       self.btnA.on(cc.Node.EventType.TOUCH_CANCEL, function(evt) {
         self._triggerEdgeBtnA(false);
-        evt.target.runAction(cc.scaleTo(0.1, 1.0));
       });
     }
 
     if (self.btnB) {
       self.btnB.on(cc.Node.EventType.TOUCH_START, function(evt) {
         self._triggerEdgeBtnB(true);
-        evt.target.runAction(cc.scaleTo(0.1, 0.3));
       });
       self.btnB.on(cc.Node.EventType.TOUCH_END, function(evt) {
         self._triggerEdgeBtnB(false);
-        evt.target.runAction(cc.scaleTo(0.1, 1.0));
       });
       self.btnB.on(cc.Node.EventType.TOUCH_CANCEL, function(evt) {
         self._triggerEdgeBtnB(false);
-        evt.target.runAction(cc.scaleTo(0.1, 1.0));
       });
     }
 
@@ -500,13 +494,23 @@ cc.Class({
       this.cachedBtnALevel = this.realtimeBtnALevel;
       this.btnAEdgeTriggerLock = true;
     }
+    if (rising) {
+      this.btnA.runAction(cc.scaleTo(0.1, 0.3));
+    } else {
+      this.btnA.runAction(cc.scaleTo(0.1, 0.5));
+    }
   },
 
-  _triggerEdgeBtnB(rising) {
+  _triggerEdgeBtnB(rising, evt) {
     this.realtimeBtnBLevel = (rising ? 1 : 0);
     if (!this.btnBEdgeTriggerLock && (1 - this.realtimeBtnBLevel) == this.cachedBtnBLevel) {
       this.cachedBtnBLevel = this.realtimeBtnBLevel;
       this.btnBEdgeTriggerLock = true;
     }
+    if (rising) {
+      this.btnB.runAction(cc.scaleTo(0.1, 0.3));
+    } else {
+      this.btnB.runAction(cc.scaleTo(0.1, 0.5));
+    }
   },
 });

frontend/assets/scripts/WsSessionMgr.js

@@ -11,6 +11,8 @@ window.DOWNSYNC_MSG_ACT_HB_REQ = 1;
 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) {
   /**
@@ -32,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);
 }
 
@@ -42,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");
 };
 
@@ -56,17 +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.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) {
@@ -124,14 +172,13 @@ 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;
     }
   }
 
-  const currentHistoryState = window.history && window.history.state ? window.history.state : {};
-
   const clientSession = new WebSocket(urlToConnect);
   clientSession.binaryType = 'arraybuffer'; // Make 'event.data' of 'onmessage' an "ArrayBuffer" instead of a "Blob"
 
@@ -176,6 +223,15 @@ 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}`);
+            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"
+          }
+          break;
         default:
           break;
       }
@@ -192,6 +248,12 @@ 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;
@@ -213,7 +275,7 @@ 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()}`);
         }
@@ -227,16 +289,68 @@ 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');
 };
 
+// For secondary ws session
+window.initSecondarySession = function(onopenCb, boundRoomId) {
+  if (window.secondarySession && window.secondarySession.readyState == WebSocket.OPEN) {
+    if (null != onopenCb) {
+      onopenCb();
+    }
+    return;
+  }
+
+  const selfPlayerStr = cc.sys.localStorage.getItem("selfPlayer");
+  const selfPlayer = null == selfPlayerStr ? null : JSON.parse(selfPlayerStr);
+  const intAuthToken = null == selfPlayer ? "" : selfPlayer.intAuthToken;
+
+  let urlToConnect = backendAddress.PROTOCOL.replace('http', 'ws') + '://' + backendAddress.HOST + ":" + backendAddress.PORT + "/tsrhtSecondary?isSecondary=true&intAuthToken=" + intAuthToken + "&boundRoomId=" + boundRoomId;
+
+  const clientSession = new WebSocket(urlToConnect);
+  clientSession.binaryType = 'arraybuffer'; // Make 'event.data' of 'onmessage' an "ArrayBuffer" instead of a "Blob"
+
+  clientSession.onopen = function(evt) {
+    console.warn("The secondary WS clientSession is opened.");
+    window.secondarySession = clientSession;
+    if (null == onopenCb) return;
+    onopenCb();
+  };
+
+  clientSession.onmessage = function(evt) {
+    if (null == evt || null == evt.data) {
+      return;
+    }
+    try {
+      const resp = window.pb.protos.WsResp.decode(new Uint8Array(evt.data));
+      //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);
+          break;
+        default:
+          break;
+      }
+    } catch (e) {
+      console.error("Secondary ws session, unexpected error when parsing data of:", evt.data, e);
+    }
+  };
+
+  clientSession.onerror = function(evt) {
+    console.error("Secondary ws session, error caught on the WS clientSession: ", evt);
+  };
+
+  clientSession.onclose = function(evt) {
+    // [WARNING] The callback "onclose" might be called AFTER the webpage is refreshed with "1001 == evt.code".
+    console.warn(`Secondary ws session is closed: evt=${JSON.stringify(evt)}, evt.code=${evt.code}`);
+  };
+};

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

@@ -1,7 +1,7 @@
 {
   "ver": "1.0.5",
-  "uuid": "d41313ca-b2c3-4436-a05f-7e0eb290b1e6",
-  "isPlugin": true,
+  "uuid": "40edd08e-316c-44b8-a50f-bd173554c554",
+  "isPlugin": false,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,
   "loadPluginInEditor": false,

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

@@ -0,0 +1,75 @@
+{
+    "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/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/udp_session.cpp

@@ -0,0 +1,398 @@
+#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"
+
+uv_udp_t* udpSocket = NULL;
+uv_thread_t recvTid;
+uv_timer_t peerPunchTimer;
+uv_async_t uvLoopStopSig;
+uv_loop_t* loop = NULL; // Only this loop is used for this simple PoC
+
+struct PeerAddr peerAddrList[maxPeerCnt];
+
+char SRV_IP[256];
+int SRV_PORT = 0;
+int UDP_TUNNEL_SRV_PORT = 0;
+struct PeerAddr udpTunnelAddr;
+
+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;
+    }
+    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 %d bytes from %s:%d", nread, ip, port);
+            break;
+        }
+        default:
+            break;
+        }
+    } else {
+        CCLOG("UDP received %d bytes from unknown sender", nread);
+    }
+    
+    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) {
+    uv_stop(loop);
+    CCLOG("UDP recv loop is signaled to stop in UvThread");
+}
+
+void _onSend(uv_udp_send_t* req, int status) {
+    CCLOG("UDP send about to free req for status:%d...", status);
+    free(req); // No need to free "req->base", it'll be handled in each "_afterXxx" callback
+    CCLOG("UDP send freed req for status:%d...", status);
+    if (status) {
+        CCLOGERROR("uv_udp_send_cb error: %s\n", uv_strerror(status));
+    }
+}
+
+void _onUvTimerClosed(uv_handle_t* timer) {
+    free(timer);
+}
+
+int const punchServerCnt = 3;
+class PunchServerWork {
+public:
+    BYTEC bytes[maxUdpPayloadBytes]; // Wasting some RAM here thus no need for explicit recursive destruction
+    size_t bytesLen;
+
+    BYTEC udpTunnelBytes[maxUdpPayloadBytes];
+    size_t udpTunnelBytesLen;
+
+    PunchServerWork(BYTEC* const newBytes, size_t newBytesLen, BYTEC* const newUdpTunnelBytes, size_t newUdpTunnelBytesLen) {
+        memset(this->bytes, 0, sizeof(this->bytes));
+        memcpy(this->bytes, newBytes, newBytesLen);
+
+        this->bytesLen = newBytesLen;
+
+        memset(this->udpTunnelBytes, 0, sizeof(this->udpTunnelBytes));
+        memcpy(this->udpTunnelBytes, newUdpTunnelBytes, newUdpTunnelBytesLen);
+
+        this->udpTunnelBytesLen = newUdpTunnelBytesLen;
+    }
+};
+void _punchServerOnUvThread(uv_work_t* wrapper) {
+    PunchServerWork* work = (PunchServerWork*)wrapper->data;
+    for (int i = 0; i < punchServerCnt; i++) {
+        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);
+        struct sockaddr_in destAddr;
+        uv_ip4_addr(SRV_IP, SRV_PORT, &destAddr);
+        uv_udp_send(req, udpSocket, &sendBuffer, 1, (struct sockaddr const*)&destAddr, _onSend);
+
+        uv_udp_send_t* udpTunnelReq = (uv_udp_send_t*)malloc(sizeof(uv_udp_send_t));
+        uv_buf_t udpTunnelSendBuffer = uv_buf_init(work->udpTunnelBytes, work->udpTunnelBytesLen);
+        struct sockaddr_in udpTunnelDestAddr;
+        uv_ip4_addr(SRV_IP, UDP_TUNNEL_SRV_PORT, &udpTunnelDestAddr);
+        udpTunnelAddr.sockAddrIn = udpTunnelDestAddr;
+        uv_udp_send(udpTunnelReq, udpSocket, &udpTunnelSendBuffer, 1, (struct sockaddr const*)&udpTunnelDestAddr, _onSend);
+    }
+}
+void _afterPunchServer(uv_work_t* wrapper, int status) {
+    CCLOG("UDP send about to free PunchServerWork for status:%d...", status);
+    PunchServerWork* work = (PunchServerWork*)wrapper->data;
+    delete work;
+    CCLOG("UDP freed PunchServerWork for status:%d...", status);
+}
+
+class PunchPeerWork {
+public:
+    int roomCapacity;
+    int selfJoinIndex;
+    int naiveRefCnt;
+    PunchPeerWork(int newRoomCapacity, int newSelfJoinIndex) {
+        this->roomCapacity = newRoomCapacity;
+        this->selfJoinIndex = newSelfJoinIndex;
+        this->naiveRefCnt = 0;
+    }
+    void refInc() {
+        ++this->naiveRefCnt;
+    }
+    void refDecAndDelIfZero() {
+        --this->naiveRefCnt;
+        if (0 >= this->naiveRefCnt) {
+            delete this;
+        }
+    }
+    virtual ~PunchPeerWork() {
+        CCLOG("PunchPeerWork instance deleted...");
+    }
+};
+void _punchPeerOnUvThreadDelayed(uv_timer_t* timer, int status) {
+    //CCLOG("_punchPeerOnUvThreadDelayed started...");
+    PunchPeerWork* work = (PunchPeerWork*)timer->data;
+    int roomCapacity = work->roomCapacity;
+    int selfJoinIndex = work->selfJoinIndex;
+
+    for (int i = 0; i < roomCapacity; i++) {
+        if (i + 1 == selfJoinIndex) {
+            continue;
+        }
+        if (0 == peerAddrList[i].sockAddrIn.sin_port) {
+            // Peer addr not initialized
+            continue;
+        }
+        //CCLOG("UDP about to punch peer joinIndex:%d", i);
+        char peerIp[17] = { 0 };
+        uv_ip4_name((struct sockaddr_in*)&(peerAddrList[i].sockAddrIn), peerIp, sizeof peerIp);
+        int peerPortSt = ntohs(peerAddrList[i].sockAddrIn.sin_port);
+        int peerPortEd = ntohs(peerAddrList[i].sockAddrIn.sin_port) + 1; // Use tunnel of backend instead of sweeping ports blindly!
+        for (int peerPort = peerPortSt; peerPort < peerPortEd; peerPort++) {
+            if (0 > peerPort) continue;
+            uv_udp_send_t* req = (uv_udp_send_t*)malloc(sizeof(uv_udp_send_t));
+            uv_buf_t sendBuffer = uv_buf_init("foobar", 6); // hardcoded for now
+            struct sockaddr_in testPeerAddr;
+            uv_ip4_addr(peerIp, peerPort, &testPeerAddr);
+            uv_udp_send(req, udpSocket, &sendBuffer, 1, (struct sockaddr const*)&testPeerAddr, _onSend);
+            CCLOG("UDP punched peer %s:%d by 6 bytes", peerIp, peerPort);
+        }
+    }
+    uv_timer_stop(timer);
+    uv_close((uv_handle_t*)timer, _onUvTimerClosed);
+    //CCLOG("_punchPeerOnUvThreadDelayed stopped...");
+    work->refDecAndDelIfZero();
+}
+int const punchPeerCnt = 3;
+void _startPunchPeerTimerOnUvThread(uv_work_t* wrapper) {
+    PunchPeerWork* work = (PunchPeerWork*)wrapper->data;
+    int roomCapacity = work->roomCapacity;
+    int selfJoinIndex = work->selfJoinIndex;
+
+    for (int j = 0; j < punchPeerCnt; j++) {
+        work->refInc();
+    }
+    for (int j = 0; j < punchPeerCnt; j++) {
+        uv_timer_t* punchTimer = (uv_timer_t*)malloc(sizeof(uv_timer_t)); // I don't think libuv timer is safe to be called from GameThread, thus calling it within UvThread here
+        uv_timer_init(loop, punchTimer);
+        punchTimer->data = work;
+        uv_timer_start(punchTimer, (uv_timer_cb)&_punchPeerOnUvThreadDelayed, j * 500, 0);
+    }
+}
+void _afterPunchPeerTimerStarted(uv_work_t* wrapper, int status) {
+    // RAM of PunchPeerWork handled by "naiveRefCnt"
+}
+
+class BroadcastInputFrameUpsyncWork {
+public:
+    BYTEC bytes[maxUdpPayloadBytes]; // Wasting some RAM here thus no need for explicit recursive destruction
+    size_t bytesLen;
+    int roomCapacity;
+    int selfJoinIndex;
+
+    BroadcastInputFrameUpsyncWork(BYTEC* const newBytes, size_t newBytesLen, int newRoomCapacity, int newSelfJoinIndex) {
+        memset(this->bytes, 0, sizeof(this->bytes));
+        memcpy(this->bytes, newBytes, newBytesLen);
+
+        this->bytesLen = newBytesLen;
+
+        this->roomCapacity = newRoomCapacity;
+        this->selfJoinIndex = newSelfJoinIndex;
+    }
+};
+int const broadcastUpsyncCnt = 1;
+void _broadcastInputFrameUpsyncOnUvThread(uv_work_t* wrapper) {
+    BroadcastInputFrameUpsyncWork* work = (BroadcastInputFrameUpsyncWork*)wrapper->data;
+    int roomCapacity = work->roomCapacity;
+    int selfJoinIndex = work->selfJoinIndex;
+    // Send to room udp tunnel in case of hole punching failure
+    for (int j = 0; j < broadcastUpsyncCnt; j++) {
+        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, udpSocket, &sendBuffer, 1, (struct sockaddr const*)&(udpTunnelAddr.sockAddrIn), _onSend);
+        CCLOG("UDP sent upsync to udp tunnel %s:%d by %u bytes round-%d", SRV_IP, UDP_TUNNEL_SRV_PORT, work->bytesLen, j);
+    }
+    
+    for (int i = 0; i < roomCapacity; i++) {
+        if (i + 1 == selfJoinIndex) {
+            continue;
+        }
+        if (0 == peerAddrList[i].sockAddrIn.sin_port) {
+            // Peer addr not initialized
+            continue;
+        }
+        char peerIp[17] = { 0 };
+        uv_ip4_name((struct sockaddr_in*)&(peerAddrList[i].sockAddrIn), peerIp, sizeof peerIp);
+        // Might want to send several times for better arrival rate
+        for (int j = 0; j < broadcastUpsyncCnt; j++) {
+            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, udpSocket, &sendBuffer, 1, (struct sockaddr const*)&(peerAddrList[i].sockAddrIn), _onSend);
+            CCLOG("UDP broadcasted upsync to peer %s:%d by %u bytes round-%d", peerIp, ntohs(peerAddrList[i].sockAddrIn.sin_port), work->bytesLen, j);
+        }
+    }
+    
+}
+void _afterBroadcastInputFrameUpsync(uv_work_t* wrapper, int status) {
+    BroadcastInputFrameUpsyncWork* work = (BroadcastInputFrameUpsyncWork*)wrapper->data;
+    delete work;
+}
+
+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 UvThread, uvRunRet1=%d", uvRunRet1);
+    uv_walk(l, _onWalkCleanup, NULL);
+    int uvRunRet2 = uv_run(l, UV_RUN_DEFAULT);
+
+    int uvCloseRet = uv_loop_close(l);
+    CCLOG("UDP recv loop is closed in UvThread, uvRunRet2=%d, uvCloseRet=%d", uvRunRet2, uvCloseRet);
+}
+
+bool DelayNoMore::UdpSession::openUdpSession(int port) {
+    loop = uv_loop_new();
+    udpSocket = (uv_udp_t*)malloc(sizeof(uv_udp_t));
+
+    int sockInitRes = uv_udp_init(loop, udpSocket); // "uv_udp_init" must precede that of "uv_udp_bind" for successful binding!
+
+    struct sockaddr_in recv_addr;
+    uv_ip4_addr("0.0.0.0", port, &recv_addr);
+    int bindRes = uv_udp_bind(udpSocket, (struct sockaddr const*)&recv_addr, UV_UDP_REUSEADDR);
+    if (0 != bindRes) {
+        CCLOGERROR("Failed to bind port=%d; bind result=%d, reason=%s", port, bindRes, uv_strerror(bindRes));
+        exit(-1);
+    }
+
+    uv_async_init(loop, &uvLoopStopSig, _onUvStopSig);
+
+    CCLOG("About to open UDP session at port=%d; bind result=%d, sock init result=%d...", port, bindRes, sockInitRes);
+
+    uv_udp_recv_start(udpSocket, _allocBuffer, _onRead);
+
+    uv_thread_create(&recvTid, startRecvLoop, loop);
+
+    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...");
+
+    for (int i = 0; i < maxPeerCnt; i++) {
+        peerAddrList[i].authKey = -1; // hardcoded for now
+        memset((char*)&peerAddrList[i].sockAddrIn, 0, sizeof(peerAddrList[i].sockAddrIn));
+    }
+    uv_async_send(&uvLoopStopSig); // 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 UvThread to end in GameThread...");
+
+    uv_thread_join(&recvTid);
+
+    free(udpSocket);
+    free(loop);
+
+    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) {
+    /*
+    [WARNING] The RAM space used for "bytes", either on stack or in heap, is preallocatedand managed by the caller which runs on the GameThread. Actual sending will be made on UvThread.
+
+    Therefore we make a copy of this message before dispatching it "GameThread -> UvThread".
+    */
+    memset(SRV_IP, 0, sizeof SRV_IP);
+    memcpy(SRV_IP, srvIp, strlen(srvIp));
+    SRV_PORT = srvPort;
+    UDP_TUNNEL_SRV_PORT = udpTunnelSrvPort;
+    PunchServerWork* work = new PunchServerWork(bytes, bytesLen, udpTunnelBytes, udpTunnelBytesBytesLen);
+    uv_work_t* wrapper = (uv_work_t*)malloc(sizeof(uv_work_t));
+    wrapper->data = work;
+    uv_queue_work(loop, wrapper, _punchServerOnUvThread, _afterPunchServer);
+
+    return true;
+}
+
+bool DelayNoMore::UdpSession::upsertPeerUdpAddr(struct PeerAddr* newPeerAddrList, int roomCapacity, int selfJoinIndex) {
+    CCLOG("upsertPeerUdpAddr called by js for roomCapacity=%d, selfJoinIndex=%d.", roomCapacity, selfJoinIndex);
+
+    // Punching between existing peer-pairs for Address/Port-restricted Cone NAT (not need for Full Cone NAT); UvThread never writes into "peerAddrList", so I assume that it's safe to skip locking for them
+    for (int i = 0; i < roomCapacity; i++) {
+        if (i == selfJoinIndex - 1) continue;
+        peerAddrList[i].sockAddrIn = (*(newPeerAddrList + i)).sockAddrIn;
+        peerAddrList[i].authKey = (*(newPeerAddrList + i)).authKey;
+    }
+
+    PunchPeerWork* work = new PunchPeerWork(roomCapacity, selfJoinIndex);
+    uv_work_t* wrapper = (uv_work_t*)malloc(sizeof(uv_work_t));
+    wrapper->data = work;
+    uv_queue_work(loop, wrapper, _startPunchPeerTimerOnUvThread, _afterPunchPeerTimerStarted);
+
+    return true;
+}
+
+bool DelayNoMore::UdpSession::broadcastInputFrameUpsync(BYTEC* const bytes, size_t bytesLen, int roomCapacity, int selfJoinIndex) {
+    BroadcastInputFrameUpsyncWork* work = new BroadcastInputFrameUpsyncWork(bytes, bytesLen, roomCapacity, selfJoinIndex);
+    uv_work_t* wrapper = (uv_work_t*)malloc(sizeof(uv_work_t));
+    wrapper->data = work;
+    uv_queue_work(loop, wrapper, _broadcastInputFrameUpsyncOnUvThread, _afterBroadcastInputFrameUpsync);
+
+    return true;
+}

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

@@ -0,0 +1,28 @@
+#include "uv/uv.h"
+#define __SSIZE_T // Otherwise "ssize_t" would have conflicting macros error that stops compiling
+
+#ifndef udp_session_hpp
+#define udp_session_hpp
+
+typedef char BYTEC;
+typedef char const CHARC;
+int const maxUdpPayloadBytes = 128;
+
+int const maxPeerCnt = 10;
+struct PeerAddr {
+    struct sockaddr_in sockAddrIn;
+    uint32_t authKey;
+};
+
+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,171 @@
+#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,25 @@
+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 \
+
+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,210 @@
+<?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" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="main.h" />
+    <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,57 @@
+<?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\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\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": "TreasureHunterX",
-  "webOrientation": "portrait",
+  "title": "DelayNoMore",
+  "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

@@ -34,9 +34,12 @@
   "design-resolution-width": 960,
   "excluded-modules": [
     "Collider",
+    "DragonBones",
     "Geom Utils",
+    "Intersection",
     "Mesh",
     "MotionStreak",
+    "NodePool",
     "Physics",
     "PageView",
     "PageViewIndicator",
@@ -68,7 +71,7 @@
     "shelter_z_reducer",
     "shelter"
   ],
-  "last-module-event-record-time": 1673930863015,
+  "last-module-event-record-time": 1674632533161,
   "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,18 +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 clean
 	gopherjs serve $(PROJECTNAME)
 
-build:
-	gopherjs build $(PROJECTNAME)
-	rm ../frontend/assets/plugin_scripts/jsexport.js && mv ./jsexport.js ../frontend/assets/plugin_scripts/jsexport.js
+clean: 
+	gopherjs clean
+	rm -f $(DST)/jsexport.js
+	#rm -f $(DST)/jsexport.js.map
 
-build-min:
+build: clean
+	gopherjs build $(PROJECTNAME)
+	mv ./jsexport.js $(DST)/	
+	#mv ./jsexport.js.map $(DST)/
+
+build-min: clean
 	gopherjs build -m $(PROJECTNAME)
-	rm ../frontend/assets/plugin_scripts/jsexport.js && mv ./jsexport.js ../frontend/assets/plugin_scripts/jsexport.js
+	mv ./jsexport.js $(DST)/	
+	#mv ./jsexport.js.map $(DST)/
 
 .PHONY: help
 

jsexport/battle/battle.go

@@ -16,13 +16,13 @@ const (
 	PATTERN_ID_UNABLE_TO_OP = -2
 	PATTERN_ID_NO_OP        = -1
 
-	WORLD_TO_VIRTUAL_GRID_RATIO = float64(100)
+	WORLD_TO_VIRTUAL_GRID_RATIO = float64(100.0)
 	VIRTUAL_GRID_TO_WORLD_RATIO = float64(1.0) / WORLD_TO_VIRTUAL_GRID_RATIO
 
 	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
 	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"
 
@@ -77,6 +77,8 @@ const (
 
 	ATK_CHARACTER_STATE_DASHING = int32(15)
 	ATK_CHARACTER_STATE_ONWALL  = int32(16)
+
+	ATK_CHARACTER_STATE_TURNAROUND = int32(17)
 )
 
 var inAirSet = map[int32]bool{
@@ -446,7 +448,7 @@ func calcHardPushbacksNorms(joinIndex int32, currPlayerDownsync, thatPlayerInNex
 	return &ret
 }
 
-func deriveOpPattern(currPlayerDownsync, thatPlayerInNextFrame *PlayerDownsync, currRenderFrame *RoomDownsyncFrame, inputsBuffer *RingBuffer) (int, bool, int32, int32) {
+func deriveOpPattern(currPlayerDownsync, thatPlayerInNextFrame *PlayerDownsync, currRenderFrame *RoomDownsyncFrame, chConfig *CharacterConfig, inputsBuffer *RingBuffer) (int, bool, int32, int32) {
 	// returns (patternId, jumpedOrNot, effectiveDx, effectiveDy)
 	delayedInputFrameId := ConvertToDelayedInputFrameId(currRenderFrame.Id)
 	delayedInputFrameIdForPrevRdf := ConvertToDelayedInputFrameId(currRenderFrame.Id - 1)
@@ -476,11 +478,19 @@ func deriveOpPattern(currPlayerDownsync, thatPlayerInNextFrame *PlayerDownsync,
 		prevBtnBLevel = prevDecodedInput.BtnBLevel
 	}
 
+	// Jumping is partially allowed within "CapturedByInertia", but moving is only allowed when "0 == FramesToRecover" (constrained later in "ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame")
 	if 0 == currPlayerDownsync.FramesToRecover {
-		// Jumping and moving are only allowed here
 		effDx, effDy = decodedInput.Dx, decodedInput.Dy
+	}
+
+	patternId := PATTERN_ID_NO_OP
+	canJumpWithinInertia := currPlayerDownsync.CapturedByInertia && ((chConfig.InertiaFramesToRecover >> 1) > currPlayerDownsync.FramesToRecover)
+	if 0 == currPlayerDownsync.FramesToRecover || canJumpWithinInertia {
 		if decodedInput.BtnBLevel > prevBtnBLevel {
-			if _, existent := inAirSet[currPlayerDownsync.CharacterState]; !existent {
+			if chConfig.DashingEnabled && 0 > decodedInput.Dy {
+				// Checking "DashingEnabled" here to allow jumping when dashing-disabled players pressed "DOWN + BtnB"
+				patternId = 5
+			} else if _, existent := inAirSet[currPlayerDownsync.CharacterState]; !existent {
 				jumpedOrNot = true
 			} else if ATK_CHARACTER_STATE_ONWALL == currPlayerDownsync.CharacterState {
 				jumpedOrNot = true
@@ -488,20 +498,21 @@ func deriveOpPattern(currPlayerDownsync, thatPlayerInNextFrame *PlayerDownsync,
 		}
 	}
 
-	patternId := PATTERN_ID_NO_OP
-    if 0 < decodedInput.BtnALevel {
-        if decodedInput.BtnALevel > prevBtnALevel {
-            if 0 > effDy {
-                patternId = 3
-            } else if 0 < effDy {
-                patternId = 2
-            } else {
-                patternId = 1
-            }
-        } else {
-            patternId = 4 // Holding
-        }
-    }
+	if PATTERN_ID_NO_OP == patternId {
+		if 0 < decodedInput.BtnALevel {
+			if decodedInput.BtnALevel > prevBtnALevel {
+				if 0 > decodedInput.Dy {
+					patternId = 3
+				} else if 0 < decodedInput.Dy {
+					patternId = 2
+				} else {
+					patternId = 1
+				}
+			} else {
+				patternId = 4 // Holding
+			}
+		}
+	}
 
 	return patternId, jumpedOrNot, effDx, effDy
 }
@@ -514,31 +525,32 @@ 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,
+			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,
 		}
 		if nextRenderFramePlayers[i].FramesToRecover < 0 {
 			nextRenderFramePlayers[i].FramesToRecover = 0
@@ -559,7 +571,7 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 	for i, currPlayerDownsync := range currRenderFrame.PlayersArr {
 		chConfig := chConfigsOrderedByJoinIndex[i]
 		thatPlayerInNextFrame := nextRenderFramePlayers[i]
-		patternId, jumpedOrNot, effDx, effDy := deriveOpPattern(currPlayerDownsync, thatPlayerInNextFrame, currRenderFrame, inputsBuffer)
+		patternId, jumpedOrNot, effDx, effDy := deriveOpPattern(currPlayerDownsync, thatPlayerInNextFrame, currRenderFrame, chConfig, inputsBuffer)
 
 		jumpedOrNotList[i] = jumpedOrNot
 		joinIndex := currPlayerDownsync.JoinIndex
@@ -631,24 +643,61 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 		}
 
 		if 0 == currPlayerDownsync.FramesToRecover {
-			if 0 != effDx {
-				xfac := int32(1)
-				if 0 > effDx {
-					xfac = -xfac
-				}
-				thatPlayerInNextFrame.DirX = effDx
-				thatPlayerInNextFrame.DirY = effDy
-
-				thatPlayerInNextFrame.VelX = xfac * currPlayerDownsync.Speed
-				if intAbs(thatPlayerInNextFrame.VelX) < intAbs(currPlayerDownsync.VelX) {
-					// Wall jumping
-					thatPlayerInNextFrame.VelX = xfac * intAbs(currPlayerDownsync.VelX)
-				}
-				thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_WALKING
-			} else {
-				thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_IDLE1
-				thatPlayerInNextFrame.VelX = 0
+			prevCapturedByInertia := currPlayerDownsync.CapturedByInertia
+			isWallJumping := (chConfig.OnWallEnabled && chConfig.WallJumpingInitVelX == intAbs(currPlayerDownsync.VelX))
+			/*
+			   if isWallJumping {
+			       fmt.Printf("joinIndex=%d is wall jumping\n{renderFrame.id: %d, currPlayerDownsync.Speed: %d, currPlayerDownsync.VelX: %d}\n", currPlayerDownsync.JoinIndex, currRenderFrame.Id, currPlayerDownsync.Speed, currPlayerDownsync.VelX)
+			   }
+			*/
+			alignedWithInertia := true
+			exactTurningAround := false
+			if 0 == effDx && 0 != thatPlayerInNextFrame.VelX {
+				alignedWithInertia = false
+			} else if 0 != effDx && 0 == thatPlayerInNextFrame.VelX {
+				alignedWithInertia = false
+			} else if 0 > effDx*thatPlayerInNextFrame.VelX {
+				alignedWithInertia = false
+				exactTurningAround = true
 			}
+
+			if !jumpedOrNot && !isWallJumping && !prevCapturedByInertia && !alignedWithInertia {
+				/*
+				   [WARNING] A "turn-around", or in more generic direction schema a "change in direction" is a hurdle for our current "prediction+rollback" approach, yet applying a "FramesToRecover" for "turn-around" can alleviate the graphical inconsistence to a huge extent! For better operational experience, this is intentionally NOT APPLIED TO WALL JUMPING!
+
+				   When "false == alignedWithInertia", we're GUARANTEED TO BE WRONG AT INPUT PREDICTION ON THE FRONTEND, but we COULD STILL BE RIGHT AT POSITION PREDICTION WITHIN "InertiaFramesToRecover" -- which together with "INPUT_DELAY_FRAMES" grants the frontend a big chance to be graphically consistent even upon wrong prediction!
+				*/
+				//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
+				if exactTurningAround {
+					thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_TURNAROUND
+					thatPlayerInNextFrame.FramesToRecover = chConfig.InertiaFramesToRecover
+				} else {
+					thatPlayerInNextFrame.FramesToRecover = (chConfig.InertiaFramesToRecover >> 1)
+				}
+			} else {
+				thatPlayerInNextFrame.CapturedByInertia = false
+				if 0 != effDx {
+					xfac := int32(1)
+					if 0 > effDx {
+						xfac = -xfac
+					}
+					thatPlayerInNextFrame.DirX = effDx
+					thatPlayerInNextFrame.DirY = effDy
+
+					if isWallJumping {
+						//fmt.Printf("joinIndex=%d is controlling while wall jumping\n{renderFrame.id: %d, currPlayerDownsync.Speed: %d, currPlayerDownsync.VelX: %d, effDx: %d}\n", currPlayerDownsync.JoinIndex, currRenderFrame.Id, currPlayerDownsync.Speed, currPlayerDownsync.VelX, effDx)
+						thatPlayerInNextFrame.VelX = xfac * intAbs(currPlayerDownsync.VelX)
+					} else {
+						thatPlayerInNextFrame.VelX = xfac * currPlayerDownsync.Speed
+					}
+					thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_WALKING
+				} else {
+					thatPlayerInNextFrame.CharacterState = ATK_CHARACTER_STATE_IDLE1
+					thatPlayerInNextFrame.VelX = 0
+				}
+			}
+
 		}
 	}
 
@@ -705,6 +754,8 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 			if ATK_CHARACTER_STATE_ONWALL == currPlayerDownsync.CharacterState && !jumpedOrNotList[i] {
 				thatPlayerInNextFrame.VelX += GRAVITY_X
 				thatPlayerInNextFrame.VelY = chConfig.WallSlidingVelY
+			} else if ATK_CHARACTER_STATE_DASHING == currPlayerDownsync.CharacterState {
+				thatPlayerInNextFrame.VelX += GRAVITY_X
 			} else {
 				thatPlayerInNextFrame.VelX += GRAVITY_X
 				thatPlayerInNextFrame.VelY += GRAVITY_Y
@@ -1020,7 +1071,7 @@ func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer *RingBuffer
 		if thatPlayerInNextFrame.InAir {
 			oldNextCharacterState := thatPlayerInNextFrame.CharacterState
 			switch oldNextCharacterState {
-			case ATK_CHARACTER_STATE_IDLE1, ATK_CHARACTER_STATE_WALKING:
+			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 {

jsexport/battle/characterConfig.go

@@ -15,8 +15,9 @@ type CharacterConfig struct {
 	GetUpInvinsibleFrames int32
 	GetUpFramesToRecover  int32
 
-	Speed           int32
-	JumpingInitVelY int32
+	Speed                  int32
+	JumpingInitVelY        int32
+	JumpingFramesToRecover int32 // Not used yet
 
 	DashingEnabled             bool
 	OnWallEnabled              bool
@@ -25,6 +26,8 @@ type CharacterConfig struct {
 	WallJumpingInitVelY        int32
 	WallSlidingVelY            int32
 
+	InertiaFramesToRecover int32
+
 	SkillMapper SkillMapperType
 }
 
@@ -42,8 +45,11 @@ var Characters = map[int]*CharacterConfig{
 		GetUpInvinsibleFrames: int32(10),
 		GetUpFramesToRecover:  int32(27),
 
-		Speed:           int32(float64(3.0) * WORLD_TO_VIRTUAL_GRID_RATIO),
-		JumpingInitVelY: int32(float64(8) * WORLD_TO_VIRTUAL_GRID_RATIO),
+		Speed:                  int32(float64(2.1) * WORLD_TO_VIRTUAL_GRID_RATIO),
+		JumpingInitVelY:        int32(float64(8) * WORLD_TO_VIRTUAL_GRID_RATIO),
+		JumpingFramesToRecover: int32(2),
+
+		InertiaFramesToRecover: int32(9),
 
 		DashingEnabled: false,
 		OnWallEnabled:  false,
@@ -88,13 +94,16 @@ var Characters = map[int]*CharacterConfig{
 		GetUpInvinsibleFrames: int32(10),
 		GetUpFramesToRecover:  int32(27),
 
-		Speed:           int32(float64(4.0) * WORLD_TO_VIRTUAL_GRID_RATIO),
-		JumpingInitVelY: int32(float64(7.5) * WORLD_TO_VIRTUAL_GRID_RATIO),
+		Speed:                  int32(float64(2.19) * WORLD_TO_VIRTUAL_GRID_RATIO), // I don't know why "2.2" is so special that it throws a compile error
+		JumpingInitVelY:        int32(float64(7.5) * WORLD_TO_VIRTUAL_GRID_RATIO),
+		JumpingFramesToRecover: int32(2),
+
+		InertiaFramesToRecover: int32(9),
 
 		DashingEnabled:             true,
 		OnWallEnabled:              true,
-		WallJumpingFramesToRecover: int32(9),                                          // 8 would be the minimum for an avg human
-		WallJumpingInitVelX:        int32(float64(2.5) * WORLD_TO_VIRTUAL_GRID_RATIO), // Default is "appeared facing right", but actually holding ctrl against left
+		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),
 
@@ -119,6 +128,9 @@ var Characters = map[int]*CharacterConfig{
 						}
 					}
 				}
+			} else if 5 == patternId {
+				// Dashing is already constrained by "FramesToRecover & CapturedByInertia" in "deriveOpPattern"
+				return 12
 			}
 
 			// By default no skill can be fired
@@ -138,8 +150,11 @@ var Characters = map[int]*CharacterConfig{
 		GetUpInvinsibleFrames: int32(8),
 		GetUpFramesToRecover:  int32(30),
 
-		Speed:           int32(float64(3.0) * WORLD_TO_VIRTUAL_GRID_RATIO),
-		JumpingInitVelY: int32(float64(7.5) * WORLD_TO_VIRTUAL_GRID_RATIO),
+		Speed:                  int32(float64(1.8) * WORLD_TO_VIRTUAL_GRID_RATIO),
+		JumpingInitVelY:        int32(float64(7.8) * WORLD_TO_VIRTUAL_GRID_RATIO),
+		JumpingFramesToRecover: int32(2),
+
+		InertiaFramesToRecover: int32(9),
 
 		DashingEnabled: false,
 		OnWallEnabled:  false,
@@ -166,11 +181,11 @@ var Characters = map[int]*CharacterConfig{
 					}
 				}
 			} else if 2 == patternId {
-				if !currPlayerDownsync.InAir {
+				if 0 == currPlayerDownsync.FramesToRecover && !currPlayerDownsync.InAir {
 					return 11
 				}
 			} else if 3 == patternId {
-				if !currPlayerDownsync.InAir {
+				if 0 == currPlayerDownsync.FramesToRecover && !currPlayerDownsync.InAir {
 					return 10
 				}
 			}
@@ -302,7 +317,7 @@ var skills = map[int]*Skill{
 					HitboxOffsetY:      int32(0),
 					HitboxSizeX:        int32(float64(24) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					HitboxSizeY:        int32(float64(32) * WORLD_TO_VIRTUAL_GRID_RATIO),
-					CancellableStFrame: int32(8),
+					CancellableStFrame: int32(13),
 					CancellableEdFrame: int32(30),
 
 					CancelTransit: map[int]int{
@@ -337,7 +352,7 @@ var skills = map[int]*Skill{
 					HitboxOffsetY:      int32(0),
 					HitboxSizeX:        int32(float64(24) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					HitboxSizeY:        int32(float64(32) * WORLD_TO_VIRTUAL_GRID_RATIO),
-					CancellableStFrame: int32(19),
+					CancellableStFrame: int32(23),
 					CancellableEdFrame: int32(36),
 					CancelTransit: map[int]int{
 						1: 6,
@@ -496,7 +511,7 @@ var skills = map[int]*Skill{
 					PushbackVelX:    int32(float64(2) * WORLD_TO_VIRTUAL_GRID_RATIO),
 					PushbackVelY:    int32(0),
 					HitboxOffsetX:   int32(float64(24) * WORLD_TO_VIRTUAL_GRID_RATIO),
-					HitboxOffsetY:   int32(float64(5) * 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,
@@ -535,6 +550,33 @@ var skills = map[int]*Skill{
 			},
 		},
 	},
+	12: &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(0),
+					ActiveFrames:    int32(0),
+					HitStunFrames:   MAX_INT32,
+					BlockStunFrames: int32(0),
+					Damage:          int32(0),
+					SelfLockVelX:    int32(float64(9) * 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,
+				},
+			},
+		},
+	},
 	255: &Skill{
 		RecoveryFrames:        int32(30),
 		RecoveryFramesOnBlock: int32(30),

jsexport/battle/room_downsync_frame.go

@@ -37,6 +37,8 @@ type PlayerDownsync struct {
 	OnWallNormX       int32
 	OnWallNormY       int32
 
+	CapturedByInertia bool
+
 	ActiveSkillId  int32
 	ActiveSkillHit int32
 

jsexport/main.go

@@ -42,7 +42,7 @@ func NewBarrierJs(boundary *Polygon2D) *js.Object {
 	})
 }
 
-func NewPlayerDownsyncJs(id, virtualGridX, virtualGridY, dirX, dirY, velX, velY, framesToRecover, framesInChState, activeSkillId, activeSkillHit, framesInvinsible, speed, battleState, characterState, joinIndex, hp, maxHp, colliderRadius int32, inAir, onWall bool, onWallNormX, onWallNormY, 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) *js.Object {
 	return js.MakeWrapper(&PlayerDownsync{
 		Id:                id,
 		VirtualGridX:      virtualGridX,
@@ -67,6 +67,7 @@ func NewPlayerDownsyncJs(id, virtualGridX, virtualGridY, dirX, dirY, velX, velY,
 		OnWall:            onWall,
 		OnWallNormX:       onWallNormX,
 		OnWallNormY:       onWallNormY,
+		CapturedByInertia: capturedByInertia,
 		BulletTeamId:      bulletTeamId,
 		ChCollisionTeamId: chCollisionTeamId,
 	})

nginx-templates/tsrht.lokcol.conf

@@ -66,4 +66,21 @@ hp application/json application/javascript;
 
       proxy_pass http://tsrht_cluster/tsrht$is_args$args;
   }
+
+  location ~^/tsrhtSecondary$ {
+      # Reference http://www.tornadoweb.org/en/stable/guide/running.html
+      proxy_pass_header Server;
+      proxy_set_header Host $http_host;
+      proxy_redirect off;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Scheme $scheme;
+
+      # Reverse-proxy for ws connection.
+      proxy_http_version 1.1;
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection "upgrade";
+
+      proxy_pass http://tsrht_cluster/tsrhtSecondary$is_args$args;
+  }
 }

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)
+		}
+	}
+}