diff --git a/README.md b/README.md index 82dd5a0..d0ff78b 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ _(in game screenshot)_ ![screenshot-1](./charts/screenshot-1.png) -Please checkout [this demo video](https://pan.baidu.com/s/123LlWcT9X-wbcYybqYnvmA?pwd=qrlw) to see whether the source codes are doing what you expect for synchronization. +Please checkout [this demo video](https://pan.baidu.com/s/1YkfuHjNLzlFVnKiEj6wrDQ?pwd=tkr5) to see whether the source codes are doing what you expect for synchronization. The video mainly shows the following features. - The backend receives inputs from frontend peers and [by a GGPO-alike manner](https://github.com/pond3r/ggpo/blob/master/doc/README.md) broadcasts back for synchronization. diff --git a/battle_srv/models/room.go b/battle_srv/models/room.go index 936f2a5..8259456 100644 --- a/battle_srv/models/room.go +++ b/battle_srv/models/room.go @@ -790,9 +790,9 @@ func (pR *Room) Dismiss() { func (pR *Room) OnDismissed() { // Always instantiates new HeapRAM blocks and let the old blocks die out due to not being retained by any root reference. - pR.WorldToVirtualGridRatio = float64(10) + pR.WorldToVirtualGridRatio = float64(1000) pR.VirtualGridToWorldRatio = float64(1.0) / pR.WorldToVirtualGridRatio // this is a one-off computation, should avoid division in iterations - pR.PlayerDefaultSpeed = 20 // Hardcoded in virtual grids per frame + pR.PlayerDefaultSpeed = int32(float64(2) * pR.WorldToVirtualGridRatio) // in virtual grids per frame pR.Players = make(map[int32]*Player) pR.PlayersArr = make([]*Player, pR.Capacity) pR.CollisionSysMap = make(map[int32]*resolv.Object) diff --git a/battle_srv/ws/serve.go b/battle_srv/ws/serve.go index 9d7b0f9..c45d3cd 100644 --- a/battle_srv/ws/serve.go +++ b/battle_srv/ws/serve.go @@ -16,6 +16,7 @@ import ( "time" . "dnmshared" + "runtime/debug" ) const ( @@ -104,7 +105,7 @@ func Serve(c *gin.Context) { } defer func() { if r := recover(); r != nil { - Logger.Warn("Recovered from: ", zap.Any("panic", r)) + Logger.Error("Recovered from: ", zap.Any("panic", r)) } }() /** @@ -356,7 +357,7 @@ func Serve(c *gin.Context) { receivingLoopAgainstPlayer := func() error { defer func() { if r := recover(); r != nil { - Logger.Warn("Goroutine `receivingLoopAgainstPlayer`, recovery spot#1, recovered from: ", zap.Any("panic", r)) + Logger.Error("Goroutine `receivingLoopAgainstPlayer`, recovery spot#1, recovered from: ", zap.Any("panic", r), zap.Any("callstack", debug.Stack())) } Logger.Info("Goroutine `receivingLoopAgainstPlayer` is stopped for:", zap.Any("playerId", playerId), zap.Any("roomId", pRoom.Id)) }() diff --git a/frontend/assets/scripts/Map.js b/frontend/assets/scripts/Map.js index 6d7deb2..e3bdf00 100644 --- a/frontend/assets/scripts/Map.js +++ b/frontend/assets/scripts/Map.js @@ -352,7 +352,7 @@ cc.Class({ window.mapIns = self; window.forceBigEndianFloatingNumDecoding = self.forceBigEndianFloatingNumDecoding; - self.showCriticalCoordinateLabels = true; + self.showCriticalCoordinateLabels = false; console.warn("+++++++ Map onLoad()"); window.handleClientSessionError = function() { diff --git a/frontend/assets/scripts/SelfPlayer.js b/frontend/assets/scripts/SelfPlayer.js index 33ab8cf..a726ecc 100644 --- a/frontend/assets/scripts/SelfPlayer.js +++ b/frontend/assets/scripts/SelfPlayer.js @@ -30,6 +30,10 @@ cc.Class({ '2-1': 'attackedRight' }; this.arrowTipNode.active = false; + + if (!this.mapIns.showCriticalCoordinateLabels) { + this.coordLabel.node.active = false; + } }, showArrowTipNode() {