Updated comments.

Added jumping sync.

ConcerningEdgeCases.md

@@ -1,15 +1,21 @@
-# Potential avalanche from local lag
+# What to be concerned for internet syncing
+1. Server received too late (solution: force confirmation)
+2. Client received too late (solution: prediction and frame chasing, big impact on user experience because the graphics will be inconsistent if mismatches occur too often)
+
+# Potential avalanche from `ACTIVE SLOW TICKER`
 Under the current "input delay" algorithm, the lag of a single player would cause all the other players to receive outdated commands, e.g. when at a certain moment   
-- player#1: renderFrameId = 100, significantly lagged due to local CPU overheated
+- player#1: renderFrameId = 100, **still active in battle but significantly lagged** due to local CPU overheated
 - player#2: renderFrameId = 240
 - player#3: renderFrameId = 239
 - player#4: renderFrameId = 242
 
 players #2, #3 #4 would receive "outdated(in their subjective feelings) but all-confirmed commands" from then on, thus forced to rollback and chase many frames - the lag due to "large range of frame-chasing" would then further deteriorate the situation - like an avalanche.   
 
-In a "no-server & p2p" setup, I couldn't think of a proper way to cope with such edge case. Solely on the frontend we could only mitigate the impact to players #2, #3, #4, e.g. a potential lag due to "large range of frame-chasing" is proactively avoided in `<proj-root>/frontend/assets/scripts/Map.js, function update(dt)`.
+**BE CAUTIOUS, THIS `ACTIVE SLOW TICKER` SITUATION HAPPENS QUITE OFTEN FOR REAL DEVICES** where different operating systems and temporary CPU overheat cause different lags for different player in a same battle! If not properly handled, slow tickers would be `inputing in the "history" of other players`, resulting in too frequent prediction mismatch and thus inconsistent graphics for other players!
 
-However in a "server as authority" setup, the server could force confirming an inputFrame without player#1's upsync, and notify player#1 to apply a "roomDownsyncFrame" as well as drop all its outdated local inputFrames. 
+In a "no-server & p2p" setup, I couldn't think of a proper way to cope with such edge case. Solely on the frontend we could only mitigate the impact to players #2, #3, #4, e.g. a potential lag due to "large range of frame-chasing" is proactively avoided in `<proj-root>/frontend/assets/scripts/Map.js, function update(dt)`. 
+
+To be fair, **a "p2p" setup can reduce round-trip to single-trip**, but w/o a point of authority in such case player#1 needs a way to recognize the slowness (e.g. check the received peer inputs) and ticks faster for a while to catch up; in contrast in a "server as authority" setup, the server could force confirming an inputFrame without player#1's upsync, and notify player#1 to apply a "roomDownsyncFrame" as well as drop all its outdated local inputFrames. 
 
 # Start up frames
 renderFrameId      |   generatedInputFrameId    |  toApplyInputFrameId            

README.md

@@ -2,10 +2,11 @@
 
 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 gif is sped up to 2x for file size reduction)_
-![gif_demo](./charts/melee_attack_2.gif)
+_(the following gif is sped up to ~1.5x for file size reduction, kindly note that animations are resumed from a partial progress)_
 
-Please also checkout [this demo video](https://pan.baidu.com/s/1fy0CuFKnVP_Gn2cDfrj6yg?pwd=q5uc) to see how this demo carries out a full 60fps synchronization with the help of _batched input upsync/downsync_ for satisfying network I/O performance.
+![gif_demo](./charts/jump_sync_spedup.gif)
+
+Please also checkout [this demo video](https://pan.baidu.com/s/1Lmot9cb0pYylfUvC8G4fDg?pwd=ia97) to see how this demo carries out a full 60fps synchronization with the help of _batched input upsync/downsync_ for satisfying network I/O performance.
 
 The video mainly shows the following features.
 - The backend receives inputs from frontend peers and broadcasts back for synchronization.

battle_srv/Makefile

@@ -1,5 +1,7 @@
 PROJECTNAME=server.exe
 ROOT_DIR=.
+#GOPROXY=https://mirrors.aliyun.com/goproxy 
+GOPROXY=https://goproxy.io
 all: help
 
 gen-constants:
@@ -13,13 +15,13 @@ run-test-and-hotreload:
 	ServerEnv=TEST CompileDaemon -log-prefix=false -build="go build"  -command="./$(PROJECTNAME)"
 
 build:
-	go build -o $(ROOT_DIR)/$(PROJECTNAME)
+	GOPROXY=$(GOPROXY) go build -o $(ROOT_DIR)/$(PROJECTNAME)
 
 run-prod: build-prod
 	./$(PROJECTNAME)
 
 build-prod:
-	go build -ldflags "-s -w -X main.VERSION=$(shell git rev-parse --short HEAD)-$(shell date "+%Y%m%d-%H:%M:%S")" -o $(ROOT_DIR)/$(PROJECTNAME)
+	GOPROXY=$(GOPROXY) go build -ldflags "-s -w -X main.VERSION=$(shell git rev-parse --short HEAD)-$(shell date "+%Y%m%d-%H:%M:%S")" -o $(ROOT_DIR)/$(PROJECTNAME)
 
 .PHONY: help
 

battle_srv/models/pb_type_convert.go

@@ -17,12 +17,16 @@ func toPbPlayers(modelInstances map[int32]*Player, withMetaInfo bool) map[int32]
 			VirtualGridY:   last.VirtualGridY,
 			DirX:           last.DirX,
 			DirY:           last.DirY,
-			ColliderRadius: last.ColliderRadius,
+			VelX:           last.VelX,
+			VelY:           last.VelY,
 			Speed:          last.Speed,
 			BattleState:    last.BattleState,
+			CharacterState: last.CharacterState,
+			InAir:          last.InAir,
+			JoinIndex:      last.JoinIndex,
+			ColliderRadius: last.ColliderRadius,
 			Score:          last.Score,
 			Removed:        last.Removed,
-			JoinIndex:      last.JoinIndex,
 		}
 		if withMetaInfo {
 			toRet[k].Name = last.Name

battle_srv/models/player.go

@@ -13,6 +13,7 @@ import (
 type PlayerBattleState struct {
 	ADDED_PENDING_BATTLE_COLLIDER_ACK   int32
 	READDED_PENDING_BATTLE_COLLIDER_ACK int32
+	READDED_BATTLE_COLLIDER_ACKED       int32
 	ACTIVE                              int32
 	DISCONNECTED                        int32
 	LOST                                int32
@@ -26,11 +27,12 @@ func InitPlayerBattleStateIns() {
 	PlayerBattleStateIns = PlayerBattleState{
 		ADDED_PENDING_BATTLE_COLLIDER_ACK:   0,
 		READDED_PENDING_BATTLE_COLLIDER_ACK: 1,
-		ACTIVE:                              2,
-		DISCONNECTED:                        3,
-		LOST:                                4,
-		EXPELLED_DURING_GAME:                5,
-		EXPELLED_IN_DISMISSAL:               6,
+		READDED_BATTLE_COLLIDER_ACKED:       2,
+		ACTIVE:                              3,
+		DISCONNECTED:                        4,
+		LOST:                                5,
+		EXPELLED_DURING_GAME:                6,
+		EXPELLED_IN_DISMISSAL:               7,
 	}
 }
 
@@ -96,7 +98,7 @@ func getPlayer(cond sq.Eq) (*Player, error) {
 				p.CreatedAt = int64(val.(int64))
 			}
 		}
-		Logger.Info("Queried player from db", zap.Any("cond", cond), zap.Any("p", p), zap.Any("pd", pd), zap.Any("cols", cols), zap.Any("rowValues", vals))
+		Logger.Debug("Queried player from db", zap.Any("cond", cond), zap.Any("p", p), zap.Any("pd", pd), zap.Any("cols", cols), zap.Any("rowValues", vals))
 	}
 	p.PlayerDownsync = pd
 	return &p, nil

battle_srv/models/ringbuf.go

@@ -21,6 +21,10 @@ func NewRingBuffer(n int32) *RingBuffer {
 }
 
 func (rb *RingBuffer) Put(pItem interface{}) {
+	for 0 < rb.Cnt && rb.Cnt >= rb.N {
+		// Make room for the new element
+		rb.Pop()
+	}
 	rb.Eles[rb.Ed] = pItem
 	rb.EdFrameId++
 	rb.Cnt++
@@ -69,5 +73,8 @@ func (rb *RingBuffer) GetByOffset(offsetFromSt int32) interface{} {
 }
 
 func (rb *RingBuffer) GetByFrameId(frameId int32) interface{} {
+	if frameId >= rb.EdFrameId || frameId < rb.StFrameId {
+		return nil
+	}
 	return rb.GetByOffset(frameId - rb.StFrameId)
 }

battle_srv/models/room_heap_manager.go

@@ -5,6 +5,7 @@ import (
 	. "dnmshared"
 	"fmt"
 	"go.uber.org/zap"
+	"strings"
 	"sync"
 )
 
@@ -21,11 +22,13 @@ var (
 
 func (pPq *RoomHeap) PrintInOrder() {
 	pq := *pPq
-	fmt.Printf("The RoomHeap instance now contains:\n")
+	s := make([]string, 0)
+	s = append(s, fmt.Sprintf("The RoomHeap instance now contains:"))
 	for i := 0; i < len(pq); i++ {
-		fmt.Printf("{index: %d, roomID: %d, score: %.2f} ", i, pq[i].Id, pq[i].Score)
+		s = append(s, fmt.Sprintf("{index: %d, roomID: %d, score: %.2f} ", i, pq[i].Id, pq[i].Score))
 	}
-	fmt.Printf("\n")
+
+	Logger.Debug(strings.Join(s, "\n"))
 }
 
 func (pq RoomHeap) Len() int { return len(pq) }

battle_srv/models/watchdog.go

@@ -0,0 +1,27 @@
+package models
+
+import (
+	"time"
+)
+
+type Watchdog struct {
+	interval time.Duration
+	timer    *time.Timer
+}
+
+func NewWatchdog(interval time.Duration, callback func()) *Watchdog {
+	w := Watchdog{
+		interval: interval,
+		timer:    time.AfterFunc(interval, callback),
+	}
+	return &w
+}
+
+func (w *Watchdog) Stop() {
+	w.timer.Stop()
+}
+
+func (w *Watchdog) Kick() {
+	w.timer.Stop()
+	w.timer.Reset(w.interval)
+}

battle_srv/start_daemon.sh

@@ -7,6 +7,7 @@ fi
 
 basedir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
+PROJECTNAME=server.exe
 OS_USER=$USER
 ServerEnv=$1
 LOG_PATH="/var/log/treasure-hunter.log"
@@ -17,5 +18,5 @@ PID_FILE="$basedir/treasure-hunter.pid"
 sudo su - root -c "touch $LOG_PATH" 
 sudo su - root -c "chown $OS_USER:$OS_USER $LOG_PATH" 
 
-ServerEnv=$ServerEnv $basedir/server >$LOG_PATH 2>&1 &
+ServerEnv=$ServerEnv $basedir/$PROJECTNAME >$LOG_PATH 2>&1 &
 echo $! > $PID_FILE

battle_srv/ws/serve.go

@@ -16,7 +16,6 @@ import (
 	"time"
 
 	. "dnmshared"
-	"runtime/debug"
 )
 
 const (
@@ -47,9 +46,8 @@ func Serve(c *gin.Context) {
 		c.AbortWithStatus(http.StatusBadRequest)
 		return
 	}
-	Logger.Info("Finding PlayerLogin record for ws authentication:", zap.Any("intAuthToken", token))
 	boundRoomId := 0
-	expectRoomId := 0
+	expectedRoomId := 0
 	var err error
 	if boundRoomIdStr, hasBoundRoomId := c.GetQuery("boundRoomId"); hasBoundRoomId {
 		boundRoomId, err = strconv.Atoi(boundRoomIdStr)
@@ -58,27 +56,28 @@ func Serve(c *gin.Context) {
 			c.AbortWithStatus(http.StatusBadRequest)
 			return
 		}
-		Logger.Info("Finding PlayerLogin record for ws authentication:", zap.Any("intAuthToken", token), zap.Any("boundRoomId", boundRoomId))
-	}
-	if expectRoomIdStr, hasExpectRoomId := c.GetQuery("expectedRoomId"); hasExpectRoomId {
-		expectRoomId, err = strconv.Atoi(expectRoomIdStr)
+		Logger.Debug("Finding PlayerLogin record for ws authentication:", zap.Any("intAuthToken", token), zap.Any("boundRoomId", boundRoomId))
+	} else if expectedRoomIdStr, hasExpectRoomId := c.GetQuery("expectedRoomId"); hasExpectRoomId {
+		expectedRoomId, err = strconv.Atoi(expectedRoomIdStr)
 		if err != nil {
 			c.AbortWithStatus(http.StatusBadRequest)
 			return
 		}
-		Logger.Info("Finding PlayerLogin record for ws authentication:", zap.Any("intAuthToken", token), zap.Any("expectedRoomId", expectRoomId))
+		Logger.Debug("Finding PlayerLogin record for ws authentication:", zap.Any("intAuthToken", token), zap.Any("expectedRoomId", expectedRoomId))
+	} else {
+		Logger.Debug("Finding PlayerLogin record for ws authentication:", zap.Any("intAuthToken", token))
 	}
 
 	// 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.Info("PlayerLogin record not found for ws authentication:", zap.Any("intAuthToken", token))
+		Logger.Warn("PlayerLogin record not found for ws authentication:", zap.Any("intAuthToken", token))
 		c.AbortWithStatus(http.StatusBadRequest)
 		return
 	}
 
-	Logger.Info("PlayerLogin record has been found for ws authentication:", zap.Any("playerId", playerId))
+	Logger.Info("PlayerLogin record has been found for ws authentication:", zap.Any("playerId", playerId), zap.Any("intAuthToken", token), zap.Any("boundRoomId", boundRoomId), zap.Any("expectedRoomId", expectedRoomId))
 
 	conn, err := upgrader.Upgrade(c.Writer, c.Request, nil)
 	if err != nil {
@@ -160,14 +159,14 @@ func Serve(c *gin.Context) {
 		signalToCloseConnOfThisPlayer(Constants.RetCode.PlayerNotFound, "")
 	}
 
-	Logger.Info("Player has logged in and its profile is found from persistent storage:", zap.Any("playerId", playerId), zap.Any("play", pPlayer))
+	Logger.Debug("Player has logged in and its profile is found from persistent storage:", zap.Any("playerId", playerId), zap.Any("player", pPlayer))
 
 	// Find a room to join.
-	Logger.Info("About to acquire RoomHeapMux for player:", zap.Any("playerId", playerId))
+	Logger.Debug("About to acquire RoomHeapMux for player:", zap.Any("playerId", playerId))
 	(*(models.RoomHeapMux)).Lock()
 	defer func() {
 		(*(models.RoomHeapMux)).Unlock()
-		Logger.Info("Released RoomHeapMux for player:", zap.Any("playerId", playerId))
+		Logger.Debug("Released RoomHeapMux for player:", zap.Any("playerId", playerId))
 	}()
 	defer func() {
 		if r := recover(); r != nil {
@@ -175,13 +174,12 @@ func Serve(c *gin.Context) {
 			signalToCloseConnOfThisPlayer(Constants.RetCode.UnknownError, "")
 		}
 	}()
-	Logger.Info("Acquired RoomHeapMux for player:", zap.Any("playerId", playerId))
+	Logger.Debug("Acquired RoomHeapMux for player:", zap.Any("playerId", playerId))
 	// Logger.Info("The RoomHeapManagerIns has:", zap.Any("addr", fmt.Sprintf("%p", models.RoomHeapManagerIns)), zap.Any("size", len(*(models.RoomHeapManagerIns))))
 	playerSuccessfullyAddedToRoom := false
 	if 0 < boundRoomId {
 		if tmpPRoom, existent := (*models.RoomMapManagerIns)[int32(boundRoomId)]; existent {
 			pRoom = tmpPRoom
-			Logger.Info("Successfully got:\n", zap.Any("roomId", pRoom.Id), zap.Any("playerId", playerId), zap.Any("forBoundRoomId", boundRoomId))
 			res := pRoom.ReAddPlayerIfPossible(pPlayer, conn, signalToCloseConnOfThisPlayer)
 			if !res {
 				Logger.Warn("Failed to get:\n", zap.Any("roomId", pRoom.Id), zap.Any("playerId", playerId), zap.Any("forBoundRoomId", boundRoomId))
@@ -189,19 +187,16 @@ func Serve(c *gin.Context) {
 				playerSuccessfullyAddedToRoom = true
 			}
 		}
-	}
-
-	if 0 < expectRoomId {
-		if tmpRoom, existent := (*models.RoomMapManagerIns)[int32(expectRoomId)]; existent {
+	} else if 0 < expectedRoomId {
+		if tmpRoom, existent := (*models.RoomMapManagerIns)[int32(expectedRoomId)]; existent {
 			pRoom = tmpRoom
-			Logger.Info("Successfully got:\n", zap.Any("roomId", pRoom.Id), zap.Any("playerId", playerId), zap.Any("forExpectedRoomId", expectRoomId))
 
 			if pRoom.ReAddPlayerIfPossible(pPlayer, conn, signalToCloseConnOfThisPlayer) {
 				playerSuccessfullyAddedToRoom = true
 			} else if pRoom.AddPlayerIfPossible(pPlayer, conn, signalToCloseConnOfThisPlayer) {
 				playerSuccessfullyAddedToRoom = true
 			} else {
-				Logger.Warn("Failed to get:\n", zap.Any("roomId", pRoom.Id), zap.Any("playerId", playerId), zap.Any("forExpectedRoomId", expectRoomId))
+				Logger.Warn("Failed to get:\n", zap.Any("roomId", pRoom.Id), zap.Any("playerId", playerId), zap.Any("forExpectedRoomId", expectedRoomId))
 				playerSuccessfullyAddedToRoom = false
 			}
 
@@ -221,7 +216,7 @@ func Serve(c *gin.Context) {
 			signalToCloseConnOfThisPlayer(Constants.RetCode.LocallyNoAvailableRoom, fmt.Sprintf("Cannot pop a (*Room) for playerId == %v!", playerId))
 		} else {
 			pRoom = tmpRoom
-			Logger.Info("Successfully popped:\n", zap.Any("roomId", pRoom.Id), zap.Any("playerId", playerId))
+			Logger.Info("Successfully popped:\n", zap.Any("roomId", pRoom.Id), zap.Any("forPlayerId", playerId))
 			res := pRoom.AddPlayerIfPossible(pPlayer, conn, signalToCloseConnOfThisPlayer)
 			if !res {
 				signalToCloseConnOfThisPlayer(Constants.RetCode.PlayerNotAddableToRoom, fmt.Sprintf("AddPlayerIfPossible returns false for roomId == %v, playerId == %v!", pRoom.Id, playerId))
@@ -270,9 +265,14 @@ func Serve(c *gin.Context) {
 			WorldToVirtualGridRatio: pRoom.WorldToVirtualGridRatio,
 			VirtualGridToWorldRatio: pRoom.VirtualGridToWorldRatio,
 
-			SpAtkLookupFrames: pRoom.SpAtkLookupFrames,
-			RenderCacheSize:   pRoom.RenderCacheSize,
-			MeleeSkillConfig:  pRoom.MeleeSkillConfig,
+			SpAtkLookupFrames:         pRoom.SpAtkLookupFrames,
+			RenderCacheSize:           pRoom.RenderCacheSize,
+			MeleeSkillConfig:          pRoom.MeleeSkillConfig,
+			SnapIntoPlatformOverlap:   pRoom.SnapIntoPlatformOverlap,
+			SnapIntoPlatformThreshold: pRoom.SnapIntoPlatformThreshold,
+			JumpingInitVelY:           pRoom.JumpingInitVelY,
+			GravityX:                  pRoom.GravityX,
+			GravityY:                  pRoom.GravityY,
 		}
 
 		resp := &pb.WsResp{
@@ -361,7 +361,7 @@ func Serve(c *gin.Context) {
 	receivingLoopAgainstPlayer := func() error {
 		defer func() {
 			if r := recover(); r != nil {
-				Logger.Error("Goroutine `receivingLoopAgainstPlayer`, recovery spot#1, recovered from: ", zap.Any("panic", r), zap.Any("callstack", debug.Stack()))
+				Logger.Error("Goroutine `receivingLoopAgainstPlayer`, recovery spot#1, recovered from: ", zap.Any("panic", r))
 			}
 			Logger.Info("Goroutine `receivingLoopAgainstPlayer` is stopped for:", zap.Any("playerId", playerId), zap.Any("roomId", pRoom.Id))
 		}()
@@ -370,7 +370,7 @@ func Serve(c *gin.Context) {
 				return nil
 			}
 
-			// Tries to receive from client-side in a non-blocking manner.
+			// TODO: Is there any potential edge-trigger improvement like the epoll approach mentioned above for the following statement? See discussion in https://github.com/gorilla/websocket/issues/122
 			_, bytes, err := conn.ReadMessage()
 			if nil != err {
 				Logger.Error("About to `signalToCloseConnOfThisPlayer`", zap.Any("roomId", pRoom.Id), zap.Any("playerId", playerId), zap.Error(err))

charts/README.md

@@ -7,3 +7,10 @@ ffmpeg -i input.mp4 -filter:v "setpts=0.5*PTS" output.mp4
 ```
 ffmpeg -ss 12 -t 13 -i input.mp4 -vf "fps=10,scale=480:-1" -loop 0 output.gif
 ```
+
+# Extract GIF (with alpha channel, e.g. exported from Fighter Factory Studio) to PNG sequence
+```
+ffmpeg -vsync vfr -i input.gif output%d.png
+```
+
+The `-vsync vfr` tells ffmpeg to disrespect the original delays set within the GIF file, otherwise many duplicate frame will be extracted by the default 60FPS.

collider_visualizer/Makefile

@@ -2,10 +2,11 @@ PROJECTNAME=viscol.exe
 ROOT_DIR=.
 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://mirrors.aliyun.com/goproxy 
+GOPROXY=https://goproxy.io
 
 build:
-	go build -o $(ROOT_DIR)/$(PROJECTNAME)
+	GOPROXY=$(GOPROXY) go build -o $(ROOT_DIR)/$(PROJECTNAME)
 
 run: build
 	./$(PROJECTNAME)

collider_visualizer/worldColliderDisplay.go

@@ -34,15 +34,19 @@ func NewWorldColliderDisplay(game *Game, stageDiscreteW, stageDiscreteH, stageTi
 	spaceOffsetX := float64(spaceW) * 0.5
 	spaceOffsetY := float64(spaceH) * 0.5
 
-	virtualGridToWorldRatio := 0.1
-	playerDefaultSpeed := 20
-	minStep := (int(float64(playerDefaultSpeed)*virtualGridToWorldRatio) << 2)
-	playerColliderRadius := float64(24)
+	worldToVirtualGridRatio := float64(1000)
+	virtualGridToWorldRatio := float64(1) / worldToVirtualGridRatio
+	playerDefaultSpeed := 1 * worldToVirtualGridRatio
+	minStep := (int(float64(playerDefaultSpeed)*virtualGridToWorldRatio) << 3)
+	playerColliderRadius := float64(12)
 	playerColliders := make([]*resolv.Object, len(playerPosList.Eles))
+	snapIntoPlatformOverlap := float64(0.1)
 	space := resolv.NewSpace(int(spaceW), int(spaceH), minStep, minStep)
+	topPadding, bottomPadding, leftPadding, rightPadding := snapIntoPlatformOverlap, snapIntoPlatformOverlap, snapIntoPlatformOverlap, snapIntoPlatformOverlap
 	for i, playerPos := range playerPosList.Eles {
-		playerCollider := GenerateRectCollider(playerPos.X, playerPos.Y, playerColliderRadius*2, playerColliderRadius*2, spaceOffsetX, spaceOffsetY, "Player") // [WARNING] Deliberately not using a circle because "resolv v0.5.1" doesn't yet align circle center with space cell center, regardless of the "specified within-object offset"
-		Logger.Info(fmt.Sprintf("Player Collider#%d: player world pos =(%.2f, %.2f), shape=%v", i, playerPos.X, playerPos.Y, ConvexPolygonStr(playerCollider.Shape.(*resolv.ConvexPolygon))))
+		colliderWidth, colliderHeight := playerColliderRadius*2, playerColliderRadius*4
+		playerCollider := GenerateRectCollider(playerPos.X, playerPos.Y, colliderWidth, colliderHeight, topPadding, bottomPadding, leftPadding, rightPadding, spaceOffsetX, spaceOffsetY, "Player") // [WARNING] Deliberately not using a circle because "resolv v0.5.1" doesn't yet align circle center with space cell center, regardless of the "specified within-object offset"
+		Logger.Info(fmt.Sprintf("Player Collider#%d: player world pos=(%.2f, %.2f), shape=%v", i, playerPos.X, playerPos.Y, ConvexPolygonStr(playerCollider.Shape.(*resolv.ConvexPolygon))))
 		playerColliders[i] = playerCollider
 		space.Add(playerCollider)
 	}
@@ -50,33 +54,35 @@ func NewWorldColliderDisplay(game *Game, stageDiscreteW, stageDiscreteH, stageTi
 	barrierLocalId := 0
 	for _, barrierUnaligned := range barrierList.Eles {
 		barrierCollider := GenerateConvexPolygonCollider(barrierUnaligned, spaceOffsetX, spaceOffsetY, "Barrier")
-		Logger.Info(fmt.Sprintf("Added barrier: shape=%v", ConvexPolygonStr(barrierCollider.Shape.(*resolv.ConvexPolygon))))
+		Logger.Debug(fmt.Sprintf("Added barrier: shape=%v", ConvexPolygonStr(barrierCollider.Shape.(*resolv.ConvexPolygon))))
 		space.Add(barrierCollider)
 		barrierLocalId++
 	}
 
 	world.Space = space
 
-	moveToCollide := false
+	moveToCollide := true
 	if moveToCollide {
-		newVx, newVy := int32(-2959), int32(-2261)
 		effPushback := Vec2D{X: float64(0), Y: float64(0)}
 		toTestPlayerCollider := playerColliders[0]
-		toTestPlayerCollider.X, toTestPlayerCollider.Y = VirtualGridToPolygonColliderAnchorPos(newVx, newVy, playerColliderRadius, playerColliderRadius, spaceOffsetX, spaceOffsetY, virtualGridToWorldRatio)
+		//colliderWidth, colliderHeight := playerColliderRadius*2, playerColliderRadius*4
+		//newVx, newVy := int32(27999), int32(-420270)
+		//toTestPlayerCollider.X, toTestPlayerCollider.Y = VirtualGridToPolygonColliderBLPos(newVx, newVy, colliderWidth, colliderHeight, topPadding, bottomPadding, leftPadding, rightPadding, spaceOffsetX, spaceOffsetY, virtualGridToWorldRatio)
 
-		Logger.Info(fmt.Sprintf("Checking collision for virtual (%d, %d), now playerShape=%v", newVx, newVy, ConvexPolygonStr(toTestPlayerCollider.Shape.(*resolv.ConvexPolygon))))
+		Logger.Info(fmt.Sprintf("Checking collision for playerShape=%v", ConvexPolygonStr(toTestPlayerCollider.Shape.(*resolv.ConvexPolygon))))
 
 		toTestPlayerCollider.Update()
 		if collision := toTestPlayerCollider.Check(0, 0); collision != nil {
 			playerShape := toTestPlayerCollider.Shape.(*resolv.ConvexPolygon)
 			for _, obj := range collision.Objects {
-				barrierShape := obj.Shape.(*resolv.ConvexPolygon)
-				if overlapped, pushbackX, pushbackY, overlapResult := CalcPushbacks(0, 0, playerShape, barrierShape); overlapped {
-					Logger.Warn(fmt.Sprintf("Overlapped: a=%v, b=%v, pushbackX=%v, pushbackY=%v", ConvexPolygonStr(playerShape), ConvexPolygonStr(barrierShape), pushbackX, pushbackY))
+				bShape := obj.Shape.(*resolv.ConvexPolygon)
+				Logger.Warn(fmt.Sprintf("Checking potential: a=%v, b=%v", ConvexPolygonStr(playerShape), ConvexPolygonStr(bShape)))
+				if overlapped, pushbackX, pushbackY, overlapResult := CalcPushbacks(0, 0, playerShape, bShape); overlapped {
+					Logger.Warn(fmt.Sprintf("Overlapped: a=%v, b=%v, pushbackX=%v, pushbackY=%v", ConvexPolygonStr(playerShape), ConvexPolygonStr(bShape), pushbackX, pushbackY))
 					effPushback.X += pushbackX
 					effPushback.Y += pushbackY
 				} else {
-					Logger.Warn(fmt.Sprintf("Collided BUT not overlapped: a=%v, b=%v, overlapResult=%v", ConvexPolygonStr(playerShape), ConvexPolygonStr(barrierShape), overlapResult))
+					Logger.Warn(fmt.Sprintf("Collided BUT not overlapped: a=%v, b=%v, overlapResult=%v", ConvexPolygonStr(playerShape), ConvexPolygonStr(bShape), overlapResult))
 				}
 			}
 			toTestPlayerCollider.X -= effPushback.X
@@ -109,13 +115,12 @@ func NewWorldColliderDisplay(game *Game, stageDiscreteW, stageDiscreteH, stageTi
 		ReleaseTriggerType: int32(1), // 1: rising-edge, 2: falling-edge
 		Damage:             int32(5),
 	}
-	bulletLeftToRight := true
+	bulletLeftToRight := false
 	if bulletLeftToRight {
 		xfac := float64(1.0)
 		offenderWx, offenderWy := playerPosList.Eles[0].X, playerPosList.Eles[0].Y
 		bulletWx, bulletWy := offenderWx+xfac*meleeBullet.HitboxOffset, offenderWy
-
-		newBulletCollider := GenerateRectCollider(bulletWx, bulletWy, meleeBullet.HitboxSize.X, meleeBullet.HitboxSize.Y, spaceOffsetX, spaceOffsetY, "MeleeBullet")
+		newBulletCollider := GenerateRectCollider(bulletWx, bulletWy, meleeBullet.HitboxSize.X, meleeBullet.HitboxSize.Y, topPadding, bottomPadding, leftPadding, rightPadding, spaceOffsetX, spaceOffsetY, "MeleeBullet")
 		space.Add(newBulletCollider)
 		bulletShape := newBulletCollider.Shape.(*resolv.ConvexPolygon)
 		Logger.Warn(fmt.Sprintf("bullet ->: Added bullet collider to space: a=%v", ConvexPolygonStr(bulletShape)))
@@ -132,13 +137,13 @@ func NewWorldColliderDisplay(game *Game, stageDiscreteW, stageDiscreteH, stageTi
 		}
 	}
 
-	bulletRightToLeft := true
+	bulletRightToLeft := false
 	if bulletRightToLeft {
 		xfac := float64(-1.0)
 		offenderWx, offenderWy := playerPosList.Eles[1].X, playerPosList.Eles[1].Y
 		bulletWx, bulletWy := offenderWx+xfac*meleeBullet.HitboxOffset, offenderWy
 
-		newBulletCollider := GenerateRectCollider(bulletWx, bulletWy, meleeBullet.HitboxSize.X, meleeBullet.HitboxSize.Y, spaceOffsetX, spaceOffsetY, "MeleeBullet")
+		newBulletCollider := GenerateRectCollider(bulletWx, bulletWy, meleeBullet.HitboxSize.X, meleeBullet.HitboxSize.Y, topPadding, bottomPadding, leftPadding, rightPadding, spaceOffsetX, spaceOffsetY, "MeleeBullet")
 		space.Add(newBulletCollider)
 		bulletShape := newBulletCollider.Shape.(*resolv.ConvexPolygon)
 		Logger.Warn(fmt.Sprintf("bullet <-: Added bullet collider to space: a=%v", ConvexPolygonStr(bulletShape)))
@@ -177,7 +182,7 @@ func (world *WorldColliderDisplay) Draw(screen *ebiten.Image) {
 		}
 	}
 
-	world.Game.DebugDraw(screen, world.Space)
+	//world.Game.DebugDraw(screen, world.Space)
 
 	if world.Game.ShowHelpText {
 

dnmshared/geometry.go

@@ -10,33 +10,33 @@ func NormVec2D(dx, dy float64) Vec2D {
 }
 
 func AlignPolygon2DToBoundingBox(input *Polygon2D) *Polygon2D {
-	// Transform again to put "anchor" at the top-left point of the bounding box for "resolv"
-	boundingBoxTL := &Vec2D{
+	// Transform again to put "anchor" at the "bottom-left point (w.r.t. world space)" of the bounding box for "resolv"
+	boundingBoxBL := &Vec2D{
 		X: math.MaxFloat64,
 		Y: math.MaxFloat64,
 	}
 	for _, p := range input.Points {
-		if p.X < boundingBoxTL.X {
-			boundingBoxTL.X = p.X
+		if p.X < boundingBoxBL.X {
+			boundingBoxBL.X = p.X
 		}
-		if p.Y < boundingBoxTL.Y {
-			boundingBoxTL.Y = p.Y
+		if p.Y < boundingBoxBL.Y {
+			boundingBoxBL.Y = p.Y
 		}
 	}
 
-	// Now "input.Anchor" should move to "input.Anchor+boundingBoxTL", thus "boundingBoxTL" is also the value of the negative diff for all "input.Points"
+	// Now "input.Anchor" should move to "input.Anchor+boundingBoxBL", thus "boundingBoxBL" is also the value of the negative diff for all "input.Points"
 	output := &Polygon2D{
 		Anchor: &Vec2D{
-			X: input.Anchor.X + boundingBoxTL.X,
-			Y: input.Anchor.Y + boundingBoxTL.Y,
+			X: input.Anchor.X + boundingBoxBL.X,
+			Y: input.Anchor.Y + boundingBoxBL.Y,
 		},
 		Points: make([]*Vec2D, len(input.Points)),
 	}
 
 	for i, p := range input.Points {
 		output.Points[i] = &Vec2D{
-			X: p.X - boundingBoxTL.X,
-			Y: p.Y - boundingBoxTL.Y,
+			X: p.X - boundingBoxBL.X,
+			Y: p.Y - boundingBoxBL.Y,
 		}
 	}
 

dnmshared/resolv_helper.go

@@ -18,13 +18,17 @@ func ConvexPolygonStr(body *resolv.ConvexPolygon) string {
 	return fmt.Sprintf("{\n%s\n}", strings.Join(s, ",\n"))
 }
 
-func GenerateRectCollider(origX, origY, w, h, spaceOffsetX, spaceOffsetY float64, tag string) *resolv.Object {
-	cx, cy := WorldToPolygonColliderAnchorPos(origX, origY, w*0.5, h*0.5, spaceOffsetX, spaceOffsetY)
-    return GenerateRectColliderInCollisionSpace(cx, cy, w, h, tag) 
+func RectCenterStr(body *resolv.Object, halfBoundingW, halfBoundingH, topPadding, bottomPadding, leftPadding, rightPadding, spaceOffsetX, spaceOffsetY float64) string {
+	return fmt.Sprintf("{%.2f, %.2f}", body.X+leftPadding+halfBoundingW-spaceOffsetX, body.Y+bottomPadding+halfBoundingH-spaceOffsetY)
 }
 
-func GenerateRectColliderInCollisionSpace(cx, cy, w, h float64, tag string) *resolv.Object {
-	collider := resolv.NewObject(cx, cy, w, h, tag)
+func GenerateRectCollider(wx, wy, w, h, topPadding, bottomPadding, leftPadding, rightPadding, spaceOffsetX, spaceOffsetY float64, tag string) *resolv.Object {
+	blX, blY := WorldToPolygonColliderBLPos(wx, wy, w*0.5, h*0.5, topPadding, bottomPadding, leftPadding, rightPadding, spaceOffsetX, spaceOffsetY)
+	return generateRectColliderInCollisionSpace(blX, blY, leftPadding+w+rightPadding, bottomPadding+h+topPadding, tag)
+}
+
+func generateRectColliderInCollisionSpace(blX, blY, w, h float64, tag string) *resolv.Object {
+	collider := resolv.NewObject(blX, blY, w, h, tag) // Unlike its frontend counter part, the position of a "resolv.Object" must be specified by "bottom-left point" because "w" and "h" must be positive, see "resolv.Object.BoundsToSpace" for details
 	shape := resolv.NewRectangle(0, 0, w, h)
 	collider.SetShape(shape)
 	return collider
@@ -66,6 +70,7 @@ func CalcPushbacks(oldDx, oldDy float64, playerShape, barrierShape *resolv.Conve
 		playerShape.SetPosition(origX, origY)
 	}()
 	playerShape.SetPosition(origX+oldDx, origY+oldDy)
+
 	overlapResult := &SatResult{
 		Overlap:       0,
 		OverlapX:      0,
@@ -74,7 +79,7 @@ func CalcPushbacks(oldDx, oldDy float64, playerShape, barrierShape *resolv.Conve
 		BContainedInA: true,
 		Axis:          vector.Vector{0, 0},
 	}
-	if overlapped := IsPolygonPairOverlapped(playerShape, barrierShape, overlapResult); overlapped {
+	if overlapped := isPolygonPairOverlapped(playerShape, barrierShape, overlapResult); overlapped {
 		pushbackX, pushbackY := overlapResult.Overlap*overlapResult.OverlapX, overlapResult.Overlap*overlapResult.OverlapY
 		return true, pushbackX, pushbackY, overlapResult
 	} else {
@@ -91,16 +96,17 @@ type SatResult struct {
 	Axis          vector.Vector
 }
 
-func IsPolygonPairOverlapped(a, b *resolv.ConvexPolygon, result *SatResult) bool {
+func isPolygonPairOverlapped(a, b *resolv.ConvexPolygon, result *SatResult) bool {
 	aCnt, bCnt := len(a.Points), len(b.Points)
 	// Single point case
 	if 1 == aCnt && 1 == bCnt {
 		if nil != result {
 			result.Overlap = 0
 		}
-		return a.Points[0].X() == b.Points[0].X() && a.Points[0].Y() == b.Points[0].Y()
+		return a.Points[0][0] == b.Points[0][0] && a.Points[0][1] == b.Points[0][1]
 	}
 
+	//Logger.Info(fmt.Sprintf("Checking collision between a=%v, b=%v", ConvexPolygonStr(a), ConvexPolygonStr(b)))
 	if 1 < aCnt {
 		for _, axis := range a.SATAxes() {
 			if isPolygonPairSeparatedByDir(a, b, axis.Unit(), result) {
@@ -116,6 +122,7 @@ func IsPolygonPairOverlapped(a, b *resolv.ConvexPolygon, result *SatResult) bool
 			}
 		}
 	}
+	//Logger.Info(fmt.Sprintf("a=%v and b=%v are overlapped", ConvexPolygonStr(a), ConvexPolygonStr(b)))
 
 	return true
 }
@@ -137,9 +144,10 @@ func isPolygonPairSeparatedByDir(a, b *resolv.ConvexPolygon, e vector.Vector, re
 		e = (-2.98, 1.49).Unit()
 	*/
 
+	//Logger.Info(fmt.Sprintf("Checking separation between a=%v, b=%v along axis e={%.3f, %.3f}#1", ConvexPolygonStr(a), ConvexPolygonStr(b), e[0], e[1]))
 	var aStart, aEnd, bStart, bEnd float64 = math.MaxFloat64, -math.MaxFloat64, math.MaxFloat64, -math.MaxFloat64
 	for _, p := range a.Points {
-		dot := (p.X()+a.X)*e.X() + (p.Y()+a.Y)*e.Y()
+		dot := (p[0]+a.X)*e[0] + (p[1]+a.Y)*e[1]
 
 		if aStart > dot {
 			aStart = dot
@@ -151,7 +159,7 @@ func isPolygonPairSeparatedByDir(a, b *resolv.ConvexPolygon, e vector.Vector, re
 	}
 
 	for _, p := range b.Points {
-		dot := (p.X()+b.X)*e.X() + (p.Y()+b.Y)*e.Y()
+		dot := (p[0]+b.X)*e[0] + (p[1]+b.Y)*e[1]
 
 		if bStart > dot {
 			bStart = dot
@@ -168,7 +176,6 @@ func isPolygonPairSeparatedByDir(a, b *resolv.ConvexPolygon, e vector.Vector, re
 	}
 
 	if nil != result {
-		result.Axis = e
 		overlap := float64(0)
 
 		if aStart < bStart {
@@ -209,16 +216,19 @@ func isPolygonPairSeparatedByDir(a, b *resolv.ConvexPolygon, e vector.Vector, re
 			absoluteOverlap = -overlap
 		}
 
-		if 0 == currentOverlap || currentOverlap > absoluteOverlap {
+		if (0 == result.Axis[0] && 0 == result.Axis[1]) || currentOverlap > absoluteOverlap {
 			var sign float64 = 1
 			if overlap < 0 {
 				sign = -1
 			}
 
 			result.Overlap = absoluteOverlap
-			result.OverlapX = e.X() * sign
-			result.OverlapY = e.Y() * sign
+			result.OverlapX = e[0] * sign
+			result.OverlapY = e[1] * sign
 		}
+
+		result.Axis = e
+		//Logger.Info(fmt.Sprintf("Checking separation between a=%v, b=%v along axis e={%.3f, %.3f}#2: aStart=%.3f, aEnd=%.3f, bStart=%.3f, bEnd=%.3f, overlap=%.3f, currentOverlap=%.3f, absoluteOverlap=%.3f, result=%v", ConvexPolygonStr(a), ConvexPolygonStr(b), e[0], e[1], aStart, aEnd, bStart, bEnd, overlap, currentOverlap, absoluteOverlap, result))
 	}
 
 	// the specified unit vector "e" doesn't separate "a" and "b", overlap result is generated
@@ -240,20 +250,20 @@ func VirtualGridToWorldPos(vx, vy int32, virtualGridToWorldRatio float64) (float
 	return wx, wy
 }
 
-func WorldToPolygonColliderAnchorPos(wx, wy, halfBoundingW, halfBoundingH, collisionSpaceOffsetX, collisionSpaceOffsetY float64) (float64, float64) {
-	return wx - halfBoundingW + collisionSpaceOffsetX, wy - halfBoundingH + collisionSpaceOffsetY
+func WorldToPolygonColliderBLPos(wx, wy, halfBoundingW, halfBoundingH, topPadding, bottomPadding, leftPadding, rightPadding, collisionSpaceOffsetX, collisionSpaceOffsetY float64) (float64, float64) {
+	return wx - halfBoundingW - leftPadding + collisionSpaceOffsetX, wy - halfBoundingH - bottomPadding + collisionSpaceOffsetY
 }
 
-func PolygonColliderAnchorToWorldPos(cx, cy, halfBoundingW, halfBoundingH, collisionSpaceOffsetX, collisionSpaceOffsetY float64) (float64, float64) {
-	return cx + halfBoundingW - collisionSpaceOffsetX, cy + halfBoundingH - collisionSpaceOffsetY
+func PolygonColliderBLToWorldPos(cx, cy, halfBoundingW, halfBoundingH, topPadding, bottomPadding, leftPadding, rightPadding, collisionSpaceOffsetX, collisionSpaceOffsetY float64) (float64, float64) {
+	return cx + halfBoundingW + leftPadding - collisionSpaceOffsetX, cy + halfBoundingH + bottomPadding - collisionSpaceOffsetY
 }
 
-func PolygonColliderAnchorToVirtualGridPos(cx, cy, halfBoundingW, halfBoundingH, collisionSpaceOffsetX, collisionSpaceOffsetY float64, worldToVirtualGridRatio float64) (int32, int32) {
-	wx, wy := PolygonColliderAnchorToWorldPos(cx, cy, halfBoundingW, halfBoundingH, collisionSpaceOffsetX, collisionSpaceOffsetY)
+func PolygonColliderBLToVirtualGridPos(cx, cy, halfBoundingW, halfBoundingH, topPadding, bottomPadding, leftPadding, rightPadding, collisionSpaceOffsetX, collisionSpaceOffsetY float64, worldToVirtualGridRatio float64) (int32, int32) {
+	wx, wy := PolygonColliderBLToWorldPos(cx, cy, halfBoundingW, halfBoundingH, topPadding, bottomPadding, leftPadding, rightPadding, collisionSpaceOffsetX, collisionSpaceOffsetY)
 	return WorldToVirtualGridPos(wx, wy, worldToVirtualGridRatio)
 }
 
-func VirtualGridToPolygonColliderAnchorPos(vx, vy int32, halfBoundingW, halfBoundingH, collisionSpaceOffsetX, collisionSpaceOffsetY float64, virtualGridToWorldRatio float64) (float64, float64) {
+func VirtualGridToPolygonColliderBLPos(vx, vy int32, halfBoundingW, halfBoundingH, topPadding, bottomPadding, leftPadding, rightPadding, collisionSpaceOffsetX, collisionSpaceOffsetY float64, virtualGridToWorldRatio float64) (float64, float64) {
 	wx, wy := VirtualGridToWorldPos(vx, vy, virtualGridToWorldRatio)
-	return WorldToPolygonColliderAnchorPos(wx, wy, halfBoundingW, halfBoundingH, collisionSpaceOffsetX, collisionSpaceOffsetY)
+	return WorldToPolygonColliderBLPos(wx, wy, halfBoundingW, halfBoundingH, topPadding, bottomPadding, leftPadding, rightPadding, collisionSpaceOffsetX, collisionSpaceOffsetY)
 }

dnmshared/tmx_parser.go

@@ -7,6 +7,7 @@ import (
 	"encoding/base64"
 	"encoding/xml"
 	"errors"
+	"fmt"
 	"go.uber.org/zap"
 	"io/ioutil"
 	"math"
@@ -43,13 +44,13 @@ type TmxOrTsxPolyline struct {
 
 type TmxOrTsxObject struct {
 	Id         int                 `xml:"id,attr"`
-	Gid        *int                `xml:"gid,attr"`
+	Gid        int                 `xml:"gid,attr"`
 	X          float64             `xml:"x,attr"`
 	Y          float64             `xml:"y,attr"`
 	Properties *TmxOrTsxProperties `xml:"properties"`
 	Polyline   *TmxOrTsxPolyline   `xml:"polyline"`
-	Width      *float64            `xml:"width,attr"`
-	Height     *float64            `xml:"height,attr"`
+	Width      float64             `xml:"width,attr"`
+	Height     float64             `xml:"height,attr"`
 }
 
 type TmxOrTsxObjectGroup struct {
@@ -376,13 +377,37 @@ func ParseTmxLayersAndGroups(pTmxMapIns *TmxMap, gidBoundariesMap map[int]StrToP
 			}
 
 			for _, singleObjInTmxFile := range objGroup.Objects {
-				if nil == singleObjInTmxFile.Polyline {
-					continue
-				}
 				if nil == singleObjInTmxFile.Properties.Property || "boundary_type" != singleObjInTmxFile.Properties.Property[0].Name || "barrier" != singleObjInTmxFile.Properties.Property[0].Value {
 					continue
 				}
 
+				if nil == singleObjInTmxFile.Polyline {
+					pts := make([]*Vec2D, 4)
+					s := make([]string, 0)
+					pts[0] = &Vec2D{
+						X: float64(0),
+						Y: float64(0),
+					}
+					pts[1] = &Vec2D{
+						X: float64(0),
+						Y: singleObjInTmxFile.Height,
+					}
+					pts[2] = &Vec2D{
+						X: singleObjInTmxFile.Width,
+						Y: singleObjInTmxFile.Height,
+					}
+					pts[3] = &Vec2D{
+						X: singleObjInTmxFile.Width,
+						Y: float64(0),
+					}
+					for _, pt := range pts {
+						s = append(s, fmt.Sprintf("%v,%v", pt.X, pt.Y))
+					}
+					singleObjInTmxFile.Polyline = &TmxOrTsxPolyline{
+						Points: strings.Join(s, " "),
+					}
+				}
+
 				thePolygon2DInWorld, err := tmxPolylineToPolygon2D(pTmxMapIns, singleObjInTmxFile, singleObjInTmxFile.Polyline)
 				if nil != err {
 					panic(err)

dragonBonesAnimProjects/library/SoldierWaterGhost.json

@@ -1 +0,0 @@
-{"SubTexture":[{"width":23,"y":44,"height":22,"name":"biu","x":53},{"width":9,"y":68,"height":14,"name":"rightArm","x":76},{"y":35,"frameX":-1,"frameY":0,"width":27,"frameWidth":29,"height":32,"name":"yinmoqe00","frameHeight":32,"x":89},{"width":34,"y":1,"height":41,"name":"body","x":53},{"width":9,"y":44,"height":13,"name":"rightShoulder","x":78},{"y":50,"frameX":0,"frameY":0,"width":19,"frameWidth":19,"height":18,"name":"rightFrontArm","frameHeight":18,"x":23},{"width":14,"y":70,"height":14,"name":"rightHand","x":23},{"y":68,"frameX":0,"frameY":0,"width":12,"frameWidth":12,"height":12,"name":"leftArm","frameHeight":12,"x":62},{"width":13,"y":73,"height":12,"name":"leftShoulder","x":1},{"width":20,"y":50,"height":21,"name":"leftFrontArm","x":1},{"width":33,"y":1,"height":32,"name":"head","x":89},{"width":50,"y":1,"height":47,"name":"head2","x":1},{"width":16,"y":68,"height":14,"name":"leftHand","x":44},{"y":59,"frameX":-1,"frameY":-2,"width":4,"frameWidth":8,"height":4,"name":"huomiao01","frameHeight":8,"x":78}],"width":128,"height":128,"name":"SoldierWaterGhost","imagePath":"SoldierWaterGhost_tex.png"}

dragonBonesProjects/library/SoldierWaterGhost.json

@@ -0,0 +1 @@
+{"width":128,"SubTexture":[{"frameWidth":23,"y":50,"frameX":-2,"frameHeight":22,"frameY":-2,"width":19,"height":19,"name":"biu","x":1},{"width":9,"y":50,"height":14,"name":"rightArm","x":42},{"frameWidth":29,"y":34,"frameX":-6,"frameHeight":32,"frameY":0,"width":20,"height":32,"name":"yinmoqe00","x":88},{"frameWidth":34,"y":1,"frameX":0,"frameHeight":41,"frameY":0,"width":33,"height":39,"name":"body","x":53},{"width":9,"y":56,"height":13,"name":"rightShoulder","x":74},{"frameWidth":19,"y":50,"frameX":0,"frameHeight":18,"frameY":0,"width":18,"height":17,"name":"rightFrontArm","x":22},{"width":14,"y":50,"height":14,"name":"rightHand","x":110},{"width":12,"y":42,"height":12,"name":"leftArm","x":74},{"width":13,"y":66,"height":12,"name":"leftShoulder","x":110},{"frameWidth":20,"y":42,"frameX":-1,"frameHeight":21,"frameY":0,"width":19,"height":21,"name":"leftFrontArm","x":53},{"width":50,"y":1,"height":47,"name":"head2","x":1},{"frameWidth":33,"y":1,"frameX":-1,"frameHeight":32,"frameY":0,"width":32,"height":31,"name":"head","x":88},{"width":16,"y":34,"height":14,"name":"leftHand","x":110},{"frameWidth":8,"y":1,"frameX":-2,"frameHeight":8,"frameY":-3,"width":2,"height":2,"name":"huomiao01","x":122}],"height":128,"name":"SoldierWaterGhost","imagePath":"SoldierWaterGhost_tex.png"}

frontend/assets/resources/animation/BluePacman/Bottom.anim

@@ -1,31 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "Bottom",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 0.25,
-  "sample": 12,
-  "speed": 1,
-  "wrapMode": "2",
-  "curveData": {
-    "comps": {
-      "cc.Sprite": {
-        "spriteFrame": [
-          {
-            "frame": 0,
-            "value": {
-              "__uuid__": "783f1240-d608-40be-8108-3013ab53cfe6"
-            }
-          },
-          {
-            "frame": 0.16666666666666666,
-            "value": {
-              "__uuid__": "393e649b-addb-4f91-b687-438433026c8d"
-            }
-          }
-        ]
-      }
-    }
-  },
-  "events": []
-}

frontend/assets/resources/animation/BluePacman/Bottom.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "115ea7bb-d47f-4d3c-a52a-f46584346c3f",
-  "subMetas": {}
-}

frontend/assets/resources/animation/BluePacman/BottomLeft.anim

@@ -1,31 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "BottomLeft",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 0.25,
-  "sample": 12,
-  "speed": 1,
-  "wrapMode": "2",
-  "curveData": {
-    "comps": {
-      "cc.Sprite": {
-        "spriteFrame": [
-          {
-            "frame": 0,
-            "value": {
-              "__uuid__": "748c55f0-e761-40f6-b13b-e416b3d8a55c"
-            }
-          },
-          {
-            "frame": 0.16666666666666666,
-            "value": {
-              "__uuid__": "6164bac7-9882-43ce-b3d0-9d062d6d0b49"
-            }
-          }
-        ]
-      }
-    }
-  },
-  "events": []
-}

frontend/assets/resources/animation/BluePacman/BottomLeft.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "a1bf7c7c-b9f7-4b65-86e3-f86a9e798fb6",
-  "subMetas": {}
-}

frontend/assets/resources/animation/BluePacman/BottomRight.anim

@@ -1,31 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "BottomRight",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 0.25,
-  "sample": 12,
-  "speed": 1,
-  "wrapMode": "2",
-  "curveData": {
-    "comps": {
-      "cc.Sprite": {
-        "spriteFrame": [
-          {
-            "frame": 0,
-            "value": {
-              "__uuid__": "34cf9fbb-8def-4faf-a56e-123b4c45706c"
-            }
-          },
-          {
-            "frame": 0.16666666666666666,
-            "value": {
-              "__uuid__": "b6709dd6-6ba7-4222-af38-de79ac80ce8b"
-            }
-          }
-        ]
-      }
-    }
-  },
-  "events": []
-}

frontend/assets/resources/animation/BluePacman/BottomRight.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "d5af527a-9f0c-4398-b2dd-84426be7bd32",
-  "subMetas": {}
-}

frontend/assets/resources/animation/BluePacman/Left.anim

@@ -1,31 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "Left",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 0.25,
-  "sample": 12,
-  "speed": 1,
-  "wrapMode": "2",
-  "curveData": {
-    "comps": {
-      "cc.Sprite": {
-        "spriteFrame": [
-          {
-            "frame": 0,
-            "value": {
-              "__uuid__": "02cd24e3-1c4a-46d7-85af-9034c9445ba7"
-            }
-          },
-          {
-            "frame": 0.16666666666666666,
-            "value": {
-              "__uuid__": "1f121837-a493-4a41-90e5-74ea560930ad"
-            }
-          }
-        ]
-      }
-    }
-  },
-  "events": []
-}

frontend/assets/resources/animation/BluePacman/Left.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "b60618d7-569d-4f13-bdeb-f20341fbadb6",
-  "subMetas": {}
-}

frontend/assets/resources/animation/BluePacman/Right.anim

@@ -1,31 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "Right",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 0.25,
-  "sample": 12,
-  "speed": 1,
-  "wrapMode": "2",
-  "curveData": {
-    "comps": {
-      "cc.Sprite": {
-        "spriteFrame": [
-          {
-            "frame": 0,
-            "value": {
-              "__uuid__": "a6ec6a1c-dde5-459d-84f9-7b2b8a163e7b"
-            }
-          },
-          {
-            "frame": 0.16666666666666666,
-            "value": {
-              "__uuid__": "b5d11244-f30a-4b0d-b67b-23648d253d44"
-            }
-          }
-        ]
-      }
-    }
-  },
-  "events": []
-}

frontend/assets/resources/animation/BluePacman/Right.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "0b3fb38e-9110-4191-9b72-6b64a224d049",
-  "subMetas": {}
-}

frontend/assets/resources/animation/BluePacman/Top.anim

@@ -1,31 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "Top",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 0.25,
-  "sample": 12,
-  "speed": 1,
-  "wrapMode": "2",
-  "curveData": {
-    "comps": {
-      "cc.Sprite": {
-        "spriteFrame": [
-          {
-            "frame": 0,
-            "value": {
-              "__uuid__": "8967d249-e9cf-4e44-85e8-6b9377129d9e"
-            }
-          },
-          {
-            "frame": 0.16666666666666666,
-            "value": {
-              "__uuid__": "492a57fb-6a5c-423a-bcfe-0695a7828881"
-            }
-          }
-        ]
-      }
-    }
-  },
-  "events": []
-}

frontend/assets/resources/animation/BluePacman/Top.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "1bc6de53-800b-4da3-ab8e-4a45e3aa4230",
-  "subMetas": {}
-}

frontend/assets/resources/animation/BluePacman/TopLeft.anim

@@ -1,31 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "TopLeft",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 0.25,
-  "sample": 12,
-  "speed": 1,
-  "wrapMode": "2",
-  "curveData": {
-    "comps": {
-      "cc.Sprite": {
-        "spriteFrame": [
-          {
-            "frame": 0,
-            "value": {
-              "__uuid__": "96187689-85df-46e8-b4db-410eae03c135"
-            }
-          },
-          {
-            "frame": 0.16666666666666666,
-            "value": {
-              "__uuid__": "6b002583-7688-43d3-b3fa-102ae0046628"
-            }
-          }
-        ]
-      }
-    }
-  },
-  "events": []
-}

frontend/assets/resources/animation/BluePacman/TopLeft.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "ee0d670c-893e-4e4d-96dd-5571db18ee97",
-  "subMetas": {}
-}

frontend/assets/resources/animation/BluePacman/TopRight.anim

@@ -1,31 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "TopRight",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 0.25,
-  "sample": 12,
-  "speed": 1,
-  "wrapMode": "2",
-  "curveData": {
-    "comps": {
-      "cc.Sprite": {
-        "spriteFrame": [
-          {
-            "frame": 0,
-            "value": {
-              "__uuid__": "ba89046f-8b70-4edb-9f61-534dff476325"
-            }
-          },
-          {
-            "frame": 0.16666666666666666,
-            "value": {
-              "__uuid__": "bc1ef316-d6ad-4538-b223-a0fed8094609"
-            }
-          }
-        ]
-      }
-    }
-  },
-  "events": []
-}

frontend/assets/resources/animation/BluePacman/TopRight.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "596df84a-2e4e-4f1d-967c-a82649f564a8",
-  "subMetas": {}
-}

frontend/assets/resources/animation/BluePacman/attackedLeft.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "8acc4e9f-3c47-4b66-9a9d-d012709680f6",
-  "subMetas": {}
-}

frontend/assets/resources/animation/BluePacman/attackedRight.anim

@@ -1,43 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "attackedRight",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 0.3333333333333333,
-  "sample": 12,
-  "speed": 1,
-  "wrapMode": "2",
-  "curveData": {
-    "comps": {
-      "cc.Sprite": {
-        "spriteFrame": [
-          {
-            "frame": 0,
-            "value": {
-              "__uuid__": "a6ec6a1c-dde5-459d-84f9-7b2b8a163e7b"
-            }
-          },
-          {
-            "frame": 0.08333333333333333,
-            "value": {
-              "__uuid__": "d5ec0aaf-d4a9-4b2e-b9c1-bdc54b355b73"
-            }
-          },
-          {
-            "frame": 0.16666666666666666,
-            "value": {
-              "__uuid__": "b5d11244-f30a-4b0d-b67b-23648d253d44"
-            }
-          },
-          {
-            "frame": 0.25,
-            "value": {
-              "__uuid__": "360dfc7d-4ed1-4fb9-8d2f-7533d05a4830"
-            }
-          }
-        ]
-      }
-    }
-  },
-  "events": []
-}

frontend/assets/resources/animation/BluePacman/attackedRight.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "c7cda0cd-dbce-4722-abd2-aeca28263a21",
-  "subMetas": {}
-}

frontend/assets/resources/animation/RedPacman/Bottom.anim

@@ -1,31 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "Bottom",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 0.25,
-  "sample": 12,
-  "speed": 1,
-  "wrapMode": "2",
-  "curveData": {
-    "comps": {
-      "cc.Sprite": {
-        "spriteFrame": [
-          {
-            "frame": 0,
-            "value": {
-              "__uuid__": "c79694bc-ff6f-416b-9047-b82f41fe791a"
-            }
-          },
-          {
-            "frame": 0.16666666666666666,
-            "value": {
-              "__uuid__": "609c77a2-bdfe-4967-8de6-646532302c97"
-            }
-          }
-        ]
-      }
-    }
-  },
-  "events": []
-}

frontend/assets/resources/animation/RedPacman/Bottom.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "28194c48-ae3b-4197-8263-0d474ae8b9bc",
-  "subMetas": {}
-}

frontend/assets/resources/animation/RedPacman/BottomLeft.anim

@@ -1,31 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "BottomLeft",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 0.25,
-  "sample": 12,
-  "speed": 1,
-  "wrapMode": "2",
-  "curveData": {
-    "comps": {
-      "cc.Sprite": {
-        "spriteFrame": [
-          {
-            "frame": 0,
-            "value": {
-              "__uuid__": "07b6d385-3f51-48c1-8165-38756b3d84fa"
-            }
-          },
-          {
-            "frame": 0.16666666666666666,
-            "value": {
-              "__uuid__": "c627bf3b-0e97-4423-aeea-54c7511894d6"
-            }
-          }
-        ]
-      }
-    }
-  },
-  "events": []
-}

frontend/assets/resources/animation/RedPacman/BottomLeft.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "e1c45a36-2022-4b18-a2db-b5e2e0a120ed",
-  "subMetas": {}
-}

frontend/assets/resources/animation/RedPacman/BottomRight.anim

@@ -1,31 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "BottomRight",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 0.25,
-  "sample": 12,
-  "speed": 1,
-  "wrapMode": "2",
-  "curveData": {
-    "comps": {
-      "cc.Sprite": {
-        "spriteFrame": [
-          {
-            "frame": 0,
-            "value": {
-              "__uuid__": "d0327836-1910-4c6a-9291-c8bb044c54f5"
-            }
-          },
-          {
-            "frame": 0.16666666666666666,
-            "value": {
-              "__uuid__": "1d3e614a-bb2a-4b1d-87ca-0cddd6e03fff"
-            }
-          }
-        ]
-      }
-    }
-  },
-  "events": []
-}

frontend/assets/resources/animation/RedPacman/BottomRight.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "126dff26-0ace-439d-89b5-b888aa52d159",
-  "subMetas": {}
-}

frontend/assets/resources/animation/RedPacman/Left.anim

@@ -1,31 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "Left",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 0.25,
-  "sample": 12,
-  "speed": 1,
-  "wrapMode": "2",
-  "curveData": {
-    "comps": {
-      "cc.Sprite": {
-        "spriteFrame": [
-          {
-            "frame": 0,
-            "value": {
-              "__uuid__": "c9528117-c878-41aa-ad5d-641fefcaa89f"
-            }
-          },
-          {
-            "frame": 0.16666666666666666,
-            "value": {
-              "__uuid__": "c0e5d042-8bc1-449b-9a2d-7844129c5188"
-            }
-          }
-        ]
-      }
-    }
-  },
-  "events": []
-}

frontend/assets/resources/animation/RedPacman/Left.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "95c2d541-8f99-446a-a7e0-094130ce6d41",
-  "subMetas": {}
-}

frontend/assets/resources/animation/RedPacman/Right.anim

@@ -1,31 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "Right",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 0.25,
-  "sample": 12,
-  "speed": 1,
-  "wrapMode": "2",
-  "curveData": {
-    "comps": {
-      "cc.Sprite": {
-        "spriteFrame": [
-          {
-            "frame": 0,
-            "value": {
-              "__uuid__": "1054cf4c-69a5-4834-8966-03bc613d4483"
-            }
-          },
-          {
-            "frame": 0.16666666666666666,
-            "value": {
-              "__uuid__": "b88522bd-8b6b-44a1-9c84-5518ae7f5c2c"
-            }
-          }
-        ]
-      }
-    }
-  },
-  "events": []
-}

frontend/assets/resources/animation/RedPacman/Right.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "380f5fa0-f77f-434a-8f39-d545ee6823c5",
-  "subMetas": {}
-}

frontend/assets/resources/animation/RedPacman/Top.anim

@@ -1,31 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "Top",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 0.25,
-  "sample": 12,
-  "speed": 1,
-  "wrapMode": "2",
-  "curveData": {
-    "comps": {
-      "cc.Sprite": {
-        "spriteFrame": [
-          {
-            "frame": 0,
-            "value": {
-              "__uuid__": "9702ca76-66c8-4ea9-a976-45f86e15830a"
-            }
-          },
-          {
-            "frame": 0.16666666666666666,
-            "value": {
-              "__uuid__": "6390f1c3-b4cc-41df-acfb-645e8f90fb36"
-            }
-          }
-        ]
-      }
-    }
-  },
-  "events": []
-}

frontend/assets/resources/animation/RedPacman/Top.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "a306c6de-ccd8-492b-bfec-c6be0a4cbde2",
-  "subMetas": {}
-}

frontend/assets/resources/animation/RedPacman/TopLeft.anim

@@ -1,31 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "TopLeft",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 0.25,
-  "sample": 12,
-  "speed": 1,
-  "wrapMode": "2",
-  "curveData": {
-    "comps": {
-      "cc.Sprite": {
-        "spriteFrame": [
-          {
-            "frame": 0,
-            "value": {
-              "__uuid__": "a669112a-f263-443d-9757-60d0372e0fe8"
-            }
-          },
-          {
-            "frame": 0.16666666666666666,
-            "value": {
-              "__uuid__": "3ed70f56-3b60-4bda-9d2a-8d4b5ecb12f9"
-            }
-          }
-        ]
-      }
-    }
-  },
-  "events": []
-}

frontend/assets/resources/animation/RedPacman/TopLeft.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "f496072b-51fd-4406-abbd-9885ac23f7a9",
-  "subMetas": {}
-}

frontend/assets/resources/animation/RedPacman/TopRight.anim

@@ -1,31 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "TopRight",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 0.25,
-  "sample": 12,
-  "speed": 1,
-  "wrapMode": "2",
-  "curveData": {
-    "comps": {
-      "cc.Sprite": {
-        "spriteFrame": [
-          {
-            "frame": 0,
-            "value": {
-              "__uuid__": "3d84f335-85c4-4dd0-a5d3-38f4da1e1611"
-            }
-          },
-          {
-            "frame": 0.16666666666666666,
-            "value": {
-              "__uuid__": "6d36877f-dc27-4ebc-9407-14fbcf2314df"
-            }
-          }
-        ]
-      }
-    }
-  },
-  "events": []
-}

frontend/assets/resources/animation/RedPacman/TopRight.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "6405ad8b-3084-4b67-8c2e-9b4d34fa3d09",
-  "subMetas": {}
-}

frontend/assets/resources/animation/RedPacman/attackedLeft.anim

@@ -1,43 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "attackedLeft",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 0.3333333333333333,
-  "sample": 12,
-  "speed": 1,
-  "wrapMode": "2",
-  "curveData": {
-    "comps": {
-      "cc.Sprite": {
-        "spriteFrame": [
-          {
-            "frame": 0,
-            "value": {
-              "__uuid__": "c9528117-c878-41aa-ad5d-641fefcaa89f"
-            }
-          },
-          {
-            "frame": 0.08333333333333333,
-            "value": {
-              "__uuid__": "987c7dc0-e81f-4891-979d-0998794e6889"
-            }
-          },
-          {
-            "frame": 0.16666666666666666,
-            "value": {
-              "__uuid__": "c0e5d042-8bc1-449b-9a2d-7844129c5188"
-            }
-          },
-          {
-            "frame": 0.25,
-            "value": {
-              "__uuid__": "9205c378-c50c-4303-af32-dbf9422375cf"
-            }
-          }
-        ]
-      }
-    }
-  },
-  "events": []
-}

frontend/assets/resources/animation/RedPacman/attackedLeft.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "af16cdcb-6e82-4be6-806d-9fc52ae99fff",
-  "subMetas": {}
-}

frontend/assets/resources/animation/RedPacman/attackedRight.anim

@@ -1,43 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "attackedRight",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 0.3333333333333333,
-  "sample": 12,
-  "speed": 1,
-  "wrapMode": "2",
-  "curveData": {
-    "comps": {
-      "cc.Sprite": {
-        "spriteFrame": [
-          {
-            "frame": 0,
-            "value": {
-              "__uuid__": "1054cf4c-69a5-4834-8966-03bc613d4483"
-            }
-          },
-          {
-            "frame": 0.08333333333333333,
-            "value": {
-              "__uuid__": "8f3cf81e-1251-4013-b684-13f2830c7425"
-            }
-          },
-          {
-            "frame": 0.16666666666666666,
-            "value": {
-              "__uuid__": "b88522bd-8b6b-44a1-9c84-5518ae7f5c2c"
-            }
-          },
-          {
-            "frame": 0.25,
-            "value": {
-              "__uuid__": "69f1bd37-6628-4fd1-b0f2-08073d1edb29"
-            }
-          }
-        ]
-      }
-    }
-  },
-  "events": []
-}

frontend/assets/resources/animation/RedPacman/attackedRight.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "02eba566-4d22-4fa7-99d7-f032f5845421",
-  "subMetas": {}
-}

frontend/assets/resources/animation/SolderWaterGhost/SoldierWaterGhost_tex.json

@@ -1 +1 @@
-{"SubTexture":[{"y":50,"frameX":-2,"frameY":-2,"width":19,"frameWidth":23,"height":19,"name":"biu","frameHeight":22,"x":1},{"width":9,"y":50,"height":14,"name":"rightArm","x":42},{"y":34,"frameX":-6,"frameY":0,"width":20,"frameWidth":29,"height":32,"name":"yinmoqe00","frameHeight":32,"x":88},{"y":1,"frameX":0,"frameY":0,"width":33,"frameWidth":34,"height":39,"name":"body","frameHeight":41,"x":53},{"width":9,"y":56,"height":13,"name":"rightShoulder","x":74},{"y":50,"frameX":0,"frameY":0,"width":18,"frameWidth":19,"height":17,"name":"rightFrontArm","frameHeight":18,"x":22},{"width":14,"y":50,"height":14,"name":"rightHand","x":110},{"width":12,"y":42,"height":12,"name":"leftArm","x":74},{"width":13,"y":66,"height":12,"name":"leftShoulder","x":110},{"y":42,"frameX":-1,"frameY":0,"width":19,"frameWidth":20,"height":21,"name":"leftFrontArm","frameHeight":21,"x":53},{"width":50,"y":1,"height":47,"name":"head2","x":1},{"y":1,"frameX":-1,"frameY":0,"width":32,"frameWidth":33,"height":31,"name":"head","frameHeight":32,"x":88},{"width":16,"y":34,"height":14,"name":"leftHand","x":110},{"y":1,"frameX":-2,"frameY":-3,"width":2,"frameWidth":8,"height":2,"name":"huomiao01","frameHeight":8,"x":122}],"width":128,"height":128,"name":"SoldierWaterGhost","imagePath":"SoldierWaterGhost_tex.png"}
+{"imagePath":"SoldierWaterGhost_tex.png","width":64,"height":64,"name":"SoldierWaterGhost","SubTexture":[{"frameY":-1,"y":27,"frameWidth":12,"frameHeight":11,"width":10,"height":10,"name":"biu","frameX":-1,"x":1},{"width":5,"y":23,"height":7,"name":"rightArm","x":40},{"frameY":0,"y":19,"frameWidth":15,"frameHeight":16,"width":10,"height":16,"name":"yinmoqe00","frameX":-3,"x":47},{"frameY":0,"y":1,"frameWidth":17,"frameHeight":21,"width":17,"height":20,"name":"body","frameX":0,"x":28},{"width":5,"y":37,"height":7,"name":"rightShoulder","x":42},{"frameY":0,"y":27,"frameWidth":10,"frameHeight":9,"width":9,"height":9,"name":"rightFrontArm","frameX":0,"x":13},{"width":7,"y":38,"height":7,"name":"rightHand","x":13},{"width":6,"y":36,"height":6,"name":"leftArm","x":34},{"width":7,"y":39,"height":6,"name":"leftShoulder","x":1},{"frameY":0,"y":23,"frameWidth":10,"frameHeight":11,"width":10,"height":11,"name":"leftFrontArm","frameX":-1,"x":28},{"width":25,"y":1,"height":24,"name":"head2","x":1},{"frameY":0,"y":1,"frameWidth":17,"frameHeight":16,"width":16,"height":16,"name":"head","frameX":-1,"x":47},{"width":8,"y":36,"height":7,"name":"leftHand","x":24},{"frameY":-2,"y":32,"frameWidth":4,"frameHeight":4,"width":1,"height":1,"name":"huomiao01","frameX":-1,"x":42}]}

frontend/assets/resources/animation/SolderWaterGhost/SoldierWaterGhost_tex.json.meta

@@ -1,7 +1,7 @@
 {
   "ver": "1.0.0",
   "uuid": "e9e703e9-3589-4713-b889-28b23406d220",
-  "atlasJson": "{\"SubTexture\":[{\"y\":50,\"frameX\":-2,\"frameY\":-2,\"width\":19,\"frameWidth\":23,\"height\":19,\"name\":\"biu\",\"frameHeight\":22,\"x\":1},{\"width\":9,\"y\":50,\"height\":14,\"name\":\"rightArm\",\"x\":42},{\"y\":34,\"frameX\":-6,\"frameY\":0,\"width\":20,\"frameWidth\":29,\"height\":32,\"name\":\"yinmoqe00\",\"frameHeight\":32,\"x\":88},{\"y\":1,\"frameX\":0,\"frameY\":0,\"width\":33,\"frameWidth\":34,\"height\":39,\"name\":\"body\",\"frameHeight\":41,\"x\":53},{\"width\":9,\"y\":56,\"height\":13,\"name\":\"rightShoulder\",\"x\":74},{\"y\":50,\"frameX\":0,\"frameY\":0,\"width\":18,\"frameWidth\":19,\"height\":17,\"name\":\"rightFrontArm\",\"frameHeight\":18,\"x\":22},{\"width\":14,\"y\":50,\"height\":14,\"name\":\"rightHand\",\"x\":110},{\"width\":12,\"y\":42,\"height\":12,\"name\":\"leftArm\",\"x\":74},{\"width\":13,\"y\":66,\"height\":12,\"name\":\"leftShoulder\",\"x\":110},{\"y\":42,\"frameX\":-1,\"frameY\":0,\"width\":19,\"frameWidth\":20,\"height\":21,\"name\":\"leftFrontArm\",\"frameHeight\":21,\"x\":53},{\"width\":50,\"y\":1,\"height\":47,\"name\":\"head2\",\"x\":1},{\"y\":1,\"frameX\":-1,\"frameY\":0,\"width\":32,\"frameWidth\":33,\"height\":31,\"name\":\"head\",\"frameHeight\":32,\"x\":88},{\"width\":16,\"y\":34,\"height\":14,\"name\":\"leftHand\",\"x\":110},{\"y\":1,\"frameX\":-2,\"frameY\":-3,\"width\":2,\"frameWidth\":8,\"height\":2,\"name\":\"huomiao01\",\"frameHeight\":8,\"x\":122}],\"width\":128,\"height\":128,\"name\":\"SoldierWaterGhost\",\"imagePath\":\"SoldierWaterGhost_tex.png\"}",
+  "atlasJson": "{\"imagePath\":\"SoldierWaterGhost_tex.png\",\"width\":64,\"height\":64,\"name\":\"SoldierWaterGhost\",\"SubTexture\":[{\"frameY\":-1,\"y\":27,\"frameWidth\":12,\"frameHeight\":11,\"width\":10,\"height\":10,\"name\":\"biu\",\"frameX\":-1,\"x\":1},{\"width\":5,\"y\":23,\"height\":7,\"name\":\"rightArm\",\"x\":40},{\"frameY\":0,\"y\":19,\"frameWidth\":15,\"frameHeight\":16,\"width\":10,\"height\":16,\"name\":\"yinmoqe00\",\"frameX\":-3,\"x\":47},{\"frameY\":0,\"y\":1,\"frameWidth\":17,\"frameHeight\":21,\"width\":17,\"height\":20,\"name\":\"body\",\"frameX\":0,\"x\":28},{\"width\":5,\"y\":37,\"height\":7,\"name\":\"rightShoulder\",\"x\":42},{\"frameY\":0,\"y\":27,\"frameWidth\":10,\"frameHeight\":9,\"width\":9,\"height\":9,\"name\":\"rightFrontArm\",\"frameX\":0,\"x\":13},{\"width\":7,\"y\":38,\"height\":7,\"name\":\"rightHand\",\"x\":13},{\"width\":6,\"y\":36,\"height\":6,\"name\":\"leftArm\",\"x\":34},{\"width\":7,\"y\":39,\"height\":6,\"name\":\"leftShoulder\",\"x\":1},{\"frameY\":0,\"y\":23,\"frameWidth\":10,\"frameHeight\":11,\"width\":10,\"height\":11,\"name\":\"leftFrontArm\",\"frameX\":-1,\"x\":28},{\"width\":25,\"y\":1,\"height\":24,\"name\":\"head2\",\"x\":1},{\"frameY\":0,\"y\":1,\"frameWidth\":17,\"frameHeight\":16,\"width\":16,\"height\":16,\"name\":\"head\",\"frameX\":-1,\"x\":47},{\"width\":8,\"y\":36,\"height\":7,\"name\":\"leftHand\",\"x\":24},{\"frameY\":-2,\"y\":32,\"frameWidth\":4,\"frameHeight\":4,\"width\":1,\"height\":1,\"name\":\"huomiao01\",\"frameX\":-1,\"x\":42}]}",
   "texture": "def168c3-3f07-43f9-a460-36b397c70a57",
   "subMetas": {}
 }

frontend/assets/resources/animation/SolderWaterGhost/SoldierWaterGhost_tex.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -0.5,
-      "offsetY": 24.5,
+      "offsetX": 0,
+      "offsetY": 9,
       "trimX": 1,
       "trimY": 1,
-      "width": 125,
-      "height": 77,
-      "rawWidth": 128,
-      "rawHeight": 128,
+      "width": 62,
+      "height": 44,
+      "rawWidth": 64,
+      "rawHeight": 64,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

frontend/assets/resources/animation/SoldierFireGhost/SoldierFireGhost_tex.json

@@ -1 +1 @@
-{"width":128,"SubTexture":[{"frameWidth":23,"y":44,"frameHeight":22,"width":22,"frameX":-1,"height":22,"name":"biu","frameY":0,"x":53},{"width":9,"y":68,"height":14,"name":"rightArm","x":76},{"frameWidth":29,"y":35,"frameHeight":32,"width":26,"frameX":-1,"height":32,"name":"yinmoqe00","frameY":0,"x":89},{"width":34,"y":1,"height":41,"name":"body","x":53},{"width":9,"y":44,"height":13,"name":"rightShoulder","x":77},{"width":19,"y":50,"height":18,"name":"rightFrontArm","x":23},{"width":14,"y":70,"height":14,"name":"rightHand","x":23},{"width":12,"y":68,"height":12,"name":"leftArm","x":62},{"width":13,"y":73,"height":12,"name":"leftShoulder","x":1},{"width":20,"y":50,"height":21,"name":"leftFrontArm","x":1},{"width":33,"y":1,"height":32,"name":"head","x":89},{"width":50,"y":1,"height":47,"name":"head2","x":1},{"width":16,"y":68,"height":14,"name":"leftHand","x":44},{"frameWidth":8,"y":59,"frameHeight":8,"width":4,"frameX":-1,"height":4,"name":"huomiao01","frameY":-2,"x":77}],"height":128,"name":"SoldierFireGhost","imagePath":"SoldierFireGhost_tex.png"}
+{"imagePath":"SoldierFireGhost_tex.png","width":64,"height":64,"name":"SoldierFireGhost","SubTexture":[{"frameY":0,"y":42,"frameWidth":12,"frameHeight":11,"width":11,"height":11,"name":"biu","frameX":-1,"x":16},{"width":5,"y":42,"height":7,"name":"rightArm","x":29},{"frameY":0,"y":27,"frameWidth":15,"frameHeight":16,"width":13,"height":16,"name":"yinmoqe00","frameX":-1,"x":1},{"width":17,"y":1,"height":21,"name":"body","x":28},{"width":5,"y":42,"height":7,"name":"rightShoulder","x":36},{"width":10,"y":45,"height":9,"name":"rightFrontArm","x":1},{"width":7,"y":56,"height":7,"name":"rightHand","x":1},{"width":6,"y":55,"height":6,"name":"leftArm","x":32},{"width":7,"y":55,"height":6,"name":"leftShoulder","x":23},{"width":10,"y":27,"height":11,"name":"leftFrontArm","x":16},{"width":25,"y":1,"height":24,"name":"head2","x":1},{"width":17,"y":24,"height":16,"name":"head","x":28},{"width":8,"y":55,"height":7,"name":"leftHand","x":13},{"frameY":-1,"y":51,"frameWidth":4,"frameHeight":4,"width":2,"height":2,"name":"huomiao01","frameX":-1,"x":29}]}

frontend/assets/resources/animation/SoldierFireGhost/SoldierFireGhost_tex.json.meta

@@ -1,7 +1,7 @@
 {
   "ver": "1.0.0",
   "uuid": "4a9187d5-a9ad-4464-a03c-d2f3cc277051",
-  "atlasJson": "{\"width\":128,\"SubTexture\":[{\"frameWidth\":23,\"y\":44,\"frameHeight\":22,\"width\":22,\"frameX\":-1,\"height\":22,\"name\":\"biu\",\"frameY\":0,\"x\":53},{\"width\":9,\"y\":68,\"height\":14,\"name\":\"rightArm\",\"x\":76},{\"frameWidth\":29,\"y\":35,\"frameHeight\":32,\"width\":26,\"frameX\":-1,\"height\":32,\"name\":\"yinmoqe00\",\"frameY\":0,\"x\":89},{\"width\":34,\"y\":1,\"height\":41,\"name\":\"body\",\"x\":53},{\"width\":9,\"y\":44,\"height\":13,\"name\":\"rightShoulder\",\"x\":77},{\"width\":19,\"y\":50,\"height\":18,\"name\":\"rightFrontArm\",\"x\":23},{\"width\":14,\"y\":70,\"height\":14,\"name\":\"rightHand\",\"x\":23},{\"width\":12,\"y\":68,\"height\":12,\"name\":\"leftArm\",\"x\":62},{\"width\":13,\"y\":73,\"height\":12,\"name\":\"leftShoulder\",\"x\":1},{\"width\":20,\"y\":50,\"height\":21,\"name\":\"leftFrontArm\",\"x\":1},{\"width\":33,\"y\":1,\"height\":32,\"name\":\"head\",\"x\":89},{\"width\":50,\"y\":1,\"height\":47,\"name\":\"head2\",\"x\":1},{\"width\":16,\"y\":68,\"height\":14,\"name\":\"leftHand\",\"x\":44},{\"frameWidth\":8,\"y\":59,\"frameHeight\":8,\"width\":4,\"frameX\":-1,\"height\":4,\"name\":\"huomiao01\",\"frameY\":-2,\"x\":77}],\"height\":128,\"name\":\"SoldierFireGhost\",\"imagePath\":\"SoldierFireGhost_tex.png\"}",
+  "atlasJson": "{\"imagePath\":\"SoldierFireGhost_tex.png\",\"width\":64,\"height\":64,\"name\":\"SoldierFireGhost\",\"SubTexture\":[{\"frameY\":0,\"y\":42,\"frameWidth\":12,\"frameHeight\":11,\"width\":11,\"height\":11,\"name\":\"biu\",\"frameX\":-1,\"x\":16},{\"width\":5,\"y\":42,\"height\":7,\"name\":\"rightArm\",\"x\":29},{\"frameY\":0,\"y\":27,\"frameWidth\":15,\"frameHeight\":16,\"width\":13,\"height\":16,\"name\":\"yinmoqe00\",\"frameX\":-1,\"x\":1},{\"width\":17,\"y\":1,\"height\":21,\"name\":\"body\",\"x\":28},{\"width\":5,\"y\":42,\"height\":7,\"name\":\"rightShoulder\",\"x\":36},{\"width\":10,\"y\":45,\"height\":9,\"name\":\"rightFrontArm\",\"x\":1},{\"width\":7,\"y\":56,\"height\":7,\"name\":\"rightHand\",\"x\":1},{\"width\":6,\"y\":55,\"height\":6,\"name\":\"leftArm\",\"x\":32},{\"width\":7,\"y\":55,\"height\":6,\"name\":\"leftShoulder\",\"x\":23},{\"width\":10,\"y\":27,\"height\":11,\"name\":\"leftFrontArm\",\"x\":16},{\"width\":25,\"y\":1,\"height\":24,\"name\":\"head2\",\"x\":1},{\"width\":17,\"y\":24,\"height\":16,\"name\":\"head\",\"x\":28},{\"width\":8,\"y\":55,\"height\":7,\"name\":\"leftHand\",\"x\":13},{\"frameY\":-1,\"y\":51,\"frameWidth\":4,\"frameHeight\":4,\"width\":2,\"height\":2,\"name\":\"huomiao01\",\"frameX\":-1,\"x\":29}]}",
   "texture": "700d963b-2192-4219-a066-8be5b3db7453",
   "subMetas": {}
 }

frontend/assets/resources/animation/SoldierFireGhost/SoldierFireGhost_tex.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -2.5,
-      "offsetY": 21,
+      "offsetX": -9,
+      "offsetY": 0,
       "trimX": 1,
       "trimY": 1,
-      "width": 121,
-      "height": 84,
-      "rawWidth": 128,
-      "rawHeight": 128,
+      "width": 44,
+      "height": 62,
+      "rawWidth": 64,
+      "rawHeight": 64,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

frontend/assets/resources/animation/SoldierFireGhost/frameAnim.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.1",
-  "uuid": "0e243c83-a137-4880-9bfe-9e1b57adc453",
+  "uuid": "3b7d864f-c9fd-4030-a6dc-9814ee12fec1",
   "isSubpackage": false,
   "subpackageName": "",
   "subMetas": {}

frontend/assets/resources/animation/SoldierFireGhost/frameAnim/SoldierFireGhost.png.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "2.3.3",
+  "uuid": "143f86bf-12d1-4e83-bdb9-a80ccc8b57d2",
+  "type": "raw",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {}
+}

frontend/assets/resources/animation/UltramanTiga.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.1",
-  "uuid": "135f388e-7e75-4ece-b267-4e07835cba74",
+  "uuid": "d7459b4f-ba3f-4ead-9e0d-ec2387c9ee1f",
   "isSubpackage": false,
   "subpackageName": "",
   "subMetas": {}

frontend/assets/resources/animation/UltramanTiga/Atk1.anim

@@ -1,12 +1,12 @@
 {
   "__type__": "cc.AnimationClip",
-  "_name": "attackedLeft",
+  "_name": "Atk1",
   "_objFlags": 0,
   "_native": "",
-  "_duration": 0.3333333333333333,
-  "sample": 12,
+  "_duration": 0.36666666666666664,
+  "sample": 60,
   "speed": 1,
-  "wrapMode": "2",
+  "wrapMode": 1,
   "curveData": {
     "comps": {
       "cc.Sprite": {
@@ -14,25 +14,25 @@
           {
             "frame": 0,
             "value": {
-              "__uuid__": "02cd24e3-1c4a-46d7-85af-9034c9445ba7"
+              "__uuid__": "a5607dff-7c39-47bc-8f27-86586f219387"
             }
           },
           {
-            "frame": 0.08333333333333333,
+            "frame": 0.11666666666666667,
             "value": {
-              "__uuid__": "8c522ad3-ee82-41a7-892e-05c05442e2e3"
+              "__uuid__": "bbcfe7c4-2341-4d58-b758-17920dbc4e0e"
             }
           },
           {
-            "frame": 0.16666666666666666,
+            "frame": 0.2833333333333333,
             "value": {
-              "__uuid__": "1f121837-a493-4a41-90e5-74ea560930ad"
+              "__uuid__": "93e45cd6-652b-4732-8139-587170884ae4"
             }
           },
           {
-            "frame": 0.25,
+            "frame": 0.35,
             "value": {
-              "__uuid__": "1c0ec5ec-51cb-467d-b597-8e69ce580cfd"
+              "__uuid__": "2c65c72d-34c0-424c-9a7e-2d961a68a1b6"
             }
           }
         ]

frontend/assets/resources/animation/UltramanTiga/Atk1.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "c738236a-0702-45f8-aa38-99457b051997",
+  "subMetas": {}
+}

frontend/assets/resources/animation/UltramanTiga/Atked1.anim

@@ -0,0 +1,25 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "Atked1",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.016666666666666666,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "26166514-7b99-4e18-a3ef-515718a7597f"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

frontend/assets/resources/animation/UltramanTiga/Atked1.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "c69bcceb-d7d1-4e33-9623-e2a374a0a6b6",
+  "subMetas": {}
+}

frontend/assets/resources/animation/UltramanTiga/Idle1.anim

@@ -0,0 +1,54 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "Idle1",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.11666666666666667,
+  "sample": 60,
+  "speed": 0.3,
+  "wrapMode": 2,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "3437907b-f662-4805-9723-78839fd930f5"
+            }
+          },
+          {
+            "frame": 0.03333333333333333,
+            "value": {
+              "__uuid__": "86de4c9c-202c-417b-abdb-7f5d4ae87045"
+            }
+          },
+          {
+            "frame": 0.06666666666666667,
+            "value": {
+              "__uuid__": "2e8dd9ad-e227-405f-a22a-33079051e709"
+            }
+          },
+          {
+            "frame": 0.1,
+            "value": {
+              "__uuid__": "03d976f3-4abb-40e9-85b9-ff532009b7ea"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": [
+    {
+      "frame": 0,
+      "func": "",
+      "params": []
+    },
+    {
+      "frame": 0,
+      "func": "",
+      "params": []
+    }
+  ]
+}

frontend/assets/resources/animation/UltramanTiga/Idle1.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "252b321f-81f4-485c-85bd-ea44d298cb76",
+  "subMetas": {}
+}

frontend/assets/resources/animation/UltramanTiga/InAirAtk1.anim

@@ -0,0 +1,37 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "InAirAtk1",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.35,
+  "sample": 60,
+  "speed": 1,
+  "wrapMode": 1,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0.016666666666666666,
+            "value": {
+              "__uuid__": "58e0a91a-e6ce-482d-8668-713867301837"
+            }
+          },
+          {
+            "frame": 0.2,
+            "value": {
+              "__uuid__": "aca5205f-5749-42fa-be3b-4f4888faf766"
+            }
+          },
+          {
+            "frame": 0.3333333333333333,
+            "value": {
+              "__uuid__": "d0f43a74-3f79-42b6-9d1e-a6c17c0cd07f"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

frontend/assets/resources/animation/UltramanTiga/InAirAtk1.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "8710591c-3f5e-4911-83e7-42cc18be6af9",
+  "subMetas": {}
+}