diff --git a/battle_srv/models/room.go b/battle_srv/models/room.go index 40ea901..5b0b0a6 100644 --- a/battle_srv/models/room.go +++ b/battle_srv/models/room.go @@ -268,7 +268,7 @@ func (pR *Room) ChooseStage() error { } rand.Seed(time.Now().Unix()) - stageNameList := []string{ /*"pacman" ,*/ "richsoil"} + stageNameList := []string{ /*"simple" ,*/ "richsoil"} chosenStageIndex := rand.Int() % len(stageNameList) // Hardcoded temporarily. -- YFLu pR.StageName = stageNameList[chosenStageIndex] @@ -328,7 +328,8 @@ func (pR *Room) ChooseStage() error { barrierPolygon2DList := *(toRetStrToPolygon2DListMap["Barrier"]) var barrierLocalIdInBattle int32 = 0 - for _, polygon2D := range barrierPolygon2DList { + for _, polygon2DUnaligned := range barrierPolygon2DList { + polygon2D := AlignPolygon2DToBoundingBox(polygon2DUnaligned) /* // For debug-printing only. Logger.Info("ChooseStage printing polygon2D for barrierPolygon2DList", zap.Any("barrierLocalIdInBattle", barrierLocalIdInBattle), zap.Any("polygon2D.Anchor", polygon2D.Anchor), zap.Any("polygon2D.Points", polygon2D.Points)) @@ -1157,9 +1158,12 @@ func (pR *Room) applyInputFrameDownsyncDynamics(fromRenderFrameId int32, toRende playerCollider := pR.CollisionSysMap[collisionPlayerIndex] if collision := playerCollider.Check(dx, dy, "Barrier"); collision != nil { changeWithCollision := collision.ContactWithObject(collision.Objects[0]) - Logger.Info(fmt.Sprintf("Collided: roomId=%v, playerId=%v, orig dx=%v, orig dy=%v, new dx =%v, new dy=%v", pR.Id, player.Id, dx, dy, changeWithCollision.X(), changeWithCollision.Y())) - dx = changeWithCollision.X() - dy = changeWithCollision.Y() + Logger.Info(fmt.Sprintf("Collided: roomId=%v, playerId=%v, orig dx=%v, orig dy=%v, proposed new dx =%v, proposed new dy=%v", pR.Id, player.Id, dx, dy, changeWithCollision.X(), changeWithCollision.Y())) + // FIXME: Use a mechanism equivalent to that of the frontend! + // dx = changeWithCollision.X() + // dy = changeWithCollision.Y() + dx = 0 + dy = 0 } playerCollider.X += dx playerCollider.Y += dy @@ -1196,7 +1200,8 @@ func (pR *Room) refreshColliders() { spaceOffsetX := float64(spaceW) * 0.5 spaceOffsetY := float64(spaceH) * 0.5 - space := resolv.NewSpace(int(spaceW), int(spaceH), int(pR.StageTileW), int(pR.StageTileH)) // allocate a new collision space everytime after a battle is settled + minStep := int(3) // the approx minimum distance a player can move per frame + space := resolv.NewSpace(int(spaceW), int(spaceH), minStep, minStep) // allocate a new collision space everytime after a battle is settled for _, player := range pR.Players { playerCollider := resolv.NewObject(player.X+spaceOffsetX, player.Y+spaceOffsetY, playerColliderRadius*2, playerColliderRadius*2) playerColliderShape := resolv.NewCircle(0, 0, playerColliderRadius*2) @@ -1210,8 +1215,10 @@ func (pR *Room) refreshColliders() { } for _, barrier := range pR.Barriers { + var w float64 = 0 var h float64 = 0 + for i, pi := range barrier.Boundary.Points { for j, pj := range barrier.Boundary.Points { if i == j { diff --git a/collider_visualizer/main.go b/collider_visualizer/main.go index 0cdeba8..516d45a 100644 --- a/collider_visualizer/main.go +++ b/collider_visualizer/main.go @@ -86,7 +86,7 @@ type Game struct { func NewGame() *Game { // stageName := "simple" // Use this for calibration - stageName := "simple2" + stageName := "richsoil" stageDiscreteW, stageDiscreteH, stageTileW, stageTileH, playerPosMap, barrierMap, err := parseStage(stageName) if nil != err { panic(err) diff --git a/collider_visualizer/worldColliderDisplay.go b/collider_visualizer/worldColliderDisplay.go index b81db11..b6f0b84 100644 --- a/collider_visualizer/worldColliderDisplay.go +++ b/collider_visualizer/worldColliderDisplay.go @@ -46,7 +46,9 @@ func NewWorldColliderDisplay(game *Game, stageDiscreteW, stageDiscreteH, stageTi } barrierLocalId := 0 - for _, barrier := range barrierList { + for _, barrierUnaligned := range barrierList { + barrier := AlignPolygon2DToBoundingBox(barrierUnaligned) + var w float64 = 0 var h float64 = 0 @@ -99,7 +101,7 @@ func (world *WorldColliderDisplay) Draw(screen *ebiten.Image) { } } - // world.Game.DebugDraw(screen, world.Space) + world.Game.DebugDraw(screen, world.Space) if world.Game.ShowHelpText { diff --git a/dnmshared/tmx_parser.go b/dnmshared/tmx_parser.go index e3a9caa..31c4d50 100644 --- a/dnmshared/tmx_parser.go +++ b/dnmshared/tmx_parser.go @@ -175,8 +175,8 @@ func (l *TmxLayer) decodeBase64() ([]uint32, error) { type Vec2DList []*Vec2D type Polygon2DList []*Polygon2D -type StrToVec2DListMap map[string]*Vec2DList // Note that it's deliberately NOT using "map[string]Vec2DList", for the easy of passing return value to "models/room.go". -type StrToPolygon2DListMap map[string]*Polygon2DList // Note that it's deliberately NOT using "map[string]Polygon2DList", for the easy of passing return value to "models/room.go". +type StrToVec2DListMap map[string]*Vec2DList +type StrToPolygon2DListMap map[string]*Polygon2DList func tmxPolylineToPolygon2D(pTmxMapIns *TmxMap, singleObjInTmxFile *TmxOrTsxObject, targetPolyline *TmxOrTsxPolyline) (*Polygon2D, error) { if nil == targetPolyline { @@ -442,3 +442,40 @@ func (pTmxMapIns *TmxMap) continuousObjLayerOffsetToContinuousMapNodePos(continu return toRet } + +func AlignPolygon2DToBoundingBox(input *Polygon2D) *Polygon2D { + // Transform again to put "anchor" at the top-left point of the bounding box for "resolv" + float64Max := float64(99999999999999.9) + boundingBoxTL := &Vec2D{ + X: float64Max, + Y: float64Max, + } + for _, p := range input.Points { + if p.X < boundingBoxTL.X { + boundingBoxTL.X = p.X + } + if p.Y < boundingBoxTL.Y { + boundingBoxTL.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" + output := &Polygon2D{ + Anchor: &Vec2D{ + X: input.Anchor.X+boundingBoxTL.X, + Y: input.Anchor.Y+boundingBoxTL.Y, + }, + Points: make([]*Vec2D, len(input.Points)), + TileWidth: input.TileWidth, + TileHeight: input.TileHeight, + } + + for i, p := range input.Points { + output.Points[i] = &Vec2D{ + X: p.X-boundingBoxTL.X, + Y: p.Y-boundingBoxTL.Y, + } + } + + return output +} diff --git a/frontend/assets/resources/map/pacman/BackgroundMap.meta b/frontend/assets/resources/map/pacman/BackgroundMap.meta deleted file mode 100644 index c24e299..0000000 --- a/frontend/assets/resources/map/pacman/BackgroundMap.meta +++ /dev/null @@ -1,7 +0,0 @@ -{ - "ver": "1.0.1", - "uuid": "f9460fe9-26ad-4e4b-8a3c-c97bef705a71", - "isSubpackage": false, - "subpackageName": "", - "subMetas": {} -} \ No newline at end of file diff --git a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H128_S01.png b/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H128_S01.png deleted file mode 100644 index b651445..0000000 Binary files a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H128_S01.png and /dev/null differ diff --git a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H128_S01.png.meta b/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H128_S01.png.meta deleted file mode 100644 index 59dba9c..0000000 --- a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H128_S01.png.meta +++ /dev/null @@ -1,34 +0,0 @@ -{ - "ver": "2.3.3", - "uuid": "b711d3f8-b9f4-41ab-a7e4-6562992fb65e", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "platformSettings": {}, - "subMetas": { - "Tile_W256_H128_S01": { - "ver": "1.0.4", - "uuid": "2d6c9481-6bd5-4c19-b468-529d027226c3", - "rawTextureUuid": "b711d3f8-b9f4-41ab-a7e4-6562992fb65e", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 831, - "trimX": 0, - "trimY": 0, - "width": 2048, - "height": 386, - "rawWidth": 2048, - "rawHeight": 2048, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H128_S01.tsx b/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H128_S01.tsx deleted file mode 100644 index 2d6b910..0000000 --- a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H128_S01.tsx +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H128_S01.tsx.meta b/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H128_S01.tsx.meta deleted file mode 100644 index 31b1b96..0000000 --- a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H128_S01.tsx.meta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ver": "2.0.0", - "uuid": "51b3303a-7c55-4f8b-b6b9-b5efb6164d19", - "subMetas": {} -} \ No newline at end of file diff --git a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S01.png b/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S01.png deleted file mode 100644 index 45aa8ef..0000000 Binary files a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S01.png and /dev/null differ diff --git a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S01.png.meta b/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S01.png.meta deleted file mode 100644 index a666374..0000000 --- a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S01.png.meta +++ /dev/null @@ -1,34 +0,0 @@ -{ - "ver": "2.3.3", - "uuid": "757f31be-7ad1-42dc-bd6b-2b4c7652e457", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "platformSettings": {}, - "subMetas": { - "Tile_W256_H256_S01": { - "ver": "1.0.4", - "uuid": "0d9aafd3-d738-473c-95b8-bf577b78f03d", - "rawTextureUuid": "757f31be-7ad1-42dc-bd6b-2b4c7652e457", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 64, - "width": 1280, - "height": 896, - "rawWidth": 1280, - "rawHeight": 1024, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S01.tsx b/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S01.tsx deleted file mode 100644 index b57d090..0000000 --- a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S01.tsx +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S01.tsx.meta b/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S01.tsx.meta deleted file mode 100644 index e87b0a8..0000000 --- a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S01.tsx.meta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ver": "2.0.0", - "uuid": "8347ba4a-e73c-4173-a9ba-f7711fae5a90", - "subMetas": {} -} \ No newline at end of file diff --git a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S02.png b/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S02.png deleted file mode 100644 index 8ddf7ff..0000000 Binary files a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S02.png and /dev/null differ diff --git a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S02.png.meta b/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S02.png.meta deleted file mode 100644 index 52f2c57..0000000 --- a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S02.png.meta +++ /dev/null @@ -1,34 +0,0 @@ -{ - "ver": "2.3.3", - "uuid": "2385ca17-af24-4122-a271-785f3010d7f2", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "platformSettings": {}, - "subMetas": { - "Tile_W256_H256_S02": { - "ver": "1.0.4", - "uuid": "34e3f356-e65d-4745-8f70-7706aa4083f8", - "rawTextureUuid": "2385ca17-af24-4122-a271-785f3010d7f2", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 19.5, - "offsetY": 3.5, - "trimX": 89, - "trimY": 0, - "width": 1409, - "height": 251, - "rawWidth": 1548, - "rawHeight": 258, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S02.tsx b/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S02.tsx deleted file mode 100644 index 0f34291..0000000 --- a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S02.tsx +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S02.tsx.meta b/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S02.tsx.meta deleted file mode 100644 index 707df4a..0000000 --- a/frontend/assets/resources/map/pacman/BackgroundMap/Tile_W256_H256_S02.tsx.meta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ver": "2.0.0", - "uuid": "05720598-8487-406c-b2f3-2059240fde56", - "subMetas": {} -} \ No newline at end of file diff --git a/frontend/assets/resources/map/pacman/BackgroundMap/map.tmx b/frontend/assets/resources/map/pacman/BackgroundMap/map.tmx deleted file mode 100644 index 4b1c9cf..0000000 --- a/frontend/assets/resources/map/pacman/BackgroundMap/map.tmx +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - eJztmNsOAyEIRNXem97+/2urSU0MEbs2A9XIwzwtuocJLrjBORdMJpPJtIyeUZeKHhtiaJwWW9I+alfRuVh/ZWJoHJqZY2tpK/dJyPfWOxHcUvxa3Oi6eUUdmHd4sLLv0p570P6h4NbwfHRuzvMZuGuez8Bd83wWbur5LNyZ/fbRyNypz3PfUzR39uPesYZ7lmo692AqNDdyTatHo7mR88m3Po/ktj4/L3fr3jAyt+a5NG7974nN33y9SNzTJObvPD9wdYOS1D+VMgcujyOJaYmuR/bMWj1yefTMdNz5kfIceSZruffk/U9uLRn3etzoO5JxG/cq3P7H/bfu/QamEBWW - - - - - eJztmdEKwyAMRfsXjv7/h449CEWSNNFrvMoOlIHdktMsWtddl8xtHNb7NKx4nhhW7DaHRAk6eK9Lyh/5bCR+SxHyIvB6M+LpQUbevFmR1oP6ankX41wP0XjWOsaM5o3kA473Q+uTmTkRvHkzot2nmdH6mGlOSmtMpjdyjuxQb4mIN9OaYnkzs5t3uyduiXij9ygedqv3k6g3y/xE1zvruk7rEzZ36Xvs3X+vWEueZPxumMHfO5dTvOsYm7tnTaljbO4t1rNaZvcTnxHW82zuXic294gLwh21P4i6MNU96oF0H9mz9zr0+ve6tj02UruVfTOad5U7Iifi/0JtTOsrVL2y647MleU+I8+ddMwge55+AUD0Fwk= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/assets/resources/map/pacman/BackgroundMap/map.tmx.meta b/frontend/assets/resources/map/pacman/BackgroundMap/map.tmx.meta deleted file mode 100644 index 02f5b17..0000000 --- a/frontend/assets/resources/map/pacman/BackgroundMap/map.tmx.meta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ver": "2.0.2", - "uuid": "4e2296fe-8855-4fb4-a407-fea295ded82e", - "subMetas": {} -} \ No newline at end of file diff --git a/frontend/assets/resources/map/pacman/Tile_W300_H300_S01.png b/frontend/assets/resources/map/pacman/Tile_W300_H300_S01.png deleted file mode 100644 index 3200517..0000000 Binary files a/frontend/assets/resources/map/pacman/Tile_W300_H300_S01.png and /dev/null differ diff --git a/frontend/assets/resources/map/pacman/Tile_W300_H300_S01.png.meta b/frontend/assets/resources/map/pacman/Tile_W300_H300_S01.png.meta deleted file mode 100644 index a669ce6..0000000 --- a/frontend/assets/resources/map/pacman/Tile_W300_H300_S01.png.meta +++ /dev/null @@ -1,34 +0,0 @@ -{ - "ver": "2.3.3", - "uuid": "0a5e9b39-6a98-4b45-9ad5-6df3effec2ef", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "platformSettings": {}, - "subMetas": { - "Tile_W300_H300_S01": { - "ver": "1.0.4", - "uuid": "acb30663-c0cf-4727-a046-26e40610c49f", - "rawTextureUuid": "0a5e9b39-6a98-4b45-9ad5-6df3effec2ef", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 4, - "offsetY": -24.5, - "trimX": 97, - "trimY": 85, - "width": 114, - "height": 179, - "rawWidth": 300, - "rawHeight": 300, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/frontend/assets/resources/map/pacman/Tile_W300_H300_S01.tsx b/frontend/assets/resources/map/pacman/Tile_W300_H300_S01.tsx deleted file mode 100644 index d958003..0000000 --- a/frontend/assets/resources/map/pacman/Tile_W300_H300_S01.tsx +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/frontend/assets/resources/map/pacman/Tile_W300_H300_S01.tsx.meta b/frontend/assets/resources/map/pacman/Tile_W300_H300_S01.tsx.meta deleted file mode 100644 index 08c04a6..0000000 --- a/frontend/assets/resources/map/pacman/Tile_W300_H300_S01.tsx.meta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ver": "2.0.0", - "uuid": "da664a14-58c3-4f57-8aca-1270f96bf3ee", - "subMetas": {} -} \ No newline at end of file diff --git a/frontend/assets/resources/map/pacman/Tile_W64_H64_S01.png b/frontend/assets/resources/map/pacman/Tile_W64_H64_S01.png deleted file mode 100644 index 1b7cb9d..0000000 Binary files a/frontend/assets/resources/map/pacman/Tile_W64_H64_S01.png and /dev/null differ diff --git a/frontend/assets/resources/map/pacman/Tile_W64_H64_S01.png.meta b/frontend/assets/resources/map/pacman/Tile_W64_H64_S01.png.meta deleted file mode 100644 index e1f3459..0000000 --- a/frontend/assets/resources/map/pacman/Tile_W64_H64_S01.png.meta +++ /dev/null @@ -1,34 +0,0 @@ -{ - "ver": "2.3.3", - "uuid": "5e68ce04-f41f-4ab0-a55c-608542e5638a", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "platformSettings": {}, - "subMetas": { - "Tile_W64_H64_S01": { - "ver": "1.0.4", - "uuid": "610a5bd5-c643-426e-a6e8-63acc5c516d9", - "rawTextureUuid": "5e68ce04-f41f-4ab0-a55c-608542e5638a", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 256, - "height": 256, - "rawWidth": 256, - "rawHeight": 256, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/frontend/assets/resources/map/pacman/Tile_W64_H64_S01.tsx b/frontend/assets/resources/map/pacman/Tile_W64_H64_S01.tsx deleted file mode 100644 index 319467a..0000000 --- a/frontend/assets/resources/map/pacman/Tile_W64_H64_S01.tsx +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/assets/resources/map/pacman/Tile_W64_H64_S01.tsx.meta b/frontend/assets/resources/map/pacman/Tile_W64_H64_S01.tsx.meta deleted file mode 100644 index d10cb1a..0000000 --- a/frontend/assets/resources/map/pacman/Tile_W64_H64_S01.tsx.meta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ver": "2.0.0", - "uuid": "59b65107-0da7-47b3-a08d-7de824dd5a39", - "subMetas": {} -} \ No newline at end of file diff --git a/frontend/assets/resources/map/pacman/map.tmx b/frontend/assets/resources/map/pacman/map.tmx deleted file mode 100644 index e04fee4..0000000 --- a/frontend/assets/resources/map/pacman/map.tmx +++ /dev/null @@ -1,335 +0,0 @@ - - - - - - - eJztz0ENACAMALGR4F8zNspyjwronZm7xPlcD0sPSw9LD0sPSw9LD0sPSw9LD0sPSw9LD0sPSw9LD0sPSw9LD0sPSw9LD0sPy7bHBg/ldQwR - - - - - - - - - - - - - eJztWctuBCEMW7Vqt9v2/7+32gMSQnnYTmB6WB+ZwZmEkHHgdnuBxe8/5WLwcyHXuzH2ccAuw5Wty3j/bjyzxlC7M9iYrFxZfNbnqi/IOqAxqfow8AWOoXZmZL58k9xvzrg1L+JS9oO6LijfCR882yvWdUH5rG+KuBgfrFo42+7CJ/m+l5MWoloYjZ+CUsN2+OLVc0YDRPa9nNzhC7LPs//Xo8FuNs5wRvt2Rw7v8AXZ5zty2FvL3Xsf4e+qsVf60l1jq754MR2w8qFSY6MaqdSRJ7KYRnNWIL509iseZ4de93TyHZirwOOM1lXtC6JnSg+K2FPnVHSysr9P+4Dq8a5+Wp2jcHq5FPWgFXuZXu/sqxCuHX1cR+1BtN4A0y96/ycldiu8XOquxWhNOZ1LDFA+RCdn/4OOeFjw9nLl/5TVUPZ8YIX3bSd6z26w33zKl0xzM/xd2hvhnKFo7ox/h/ZmtOcpXzp1q6K5PXjfjPSAKJcF9jwXQdd9B8q1E8pZYUW3zlBqVYSOPRatm1XjKrUqQsUXties1qqs9kd8im5l7ovQnOzYr0wuWc+YOz7kvcq6ILkU9ZOqhmfvdj17M6rn3ayGV30YUM8qB6qxeIK9n96FaixmXOVDJ3bomRc4/AGscghn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/assets/resources/map/pacman/map.tmx.meta b/frontend/assets/resources/map/pacman/map.tmx.meta deleted file mode 100644 index 0afb7ea..0000000 --- a/frontend/assets/resources/map/pacman/map.tmx.meta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ver": "2.0.2", - "uuid": "7fd0b77d-0736-4e00-89eb-7111f07ed4f1", - "subMetas": {} -} \ No newline at end of file diff --git a/frontend/assets/resources/map/richsoil/map.tmx b/frontend/assets/resources/map/richsoil/map.tmx index 1bbfb8c..b945aea 100644 --- a/frontend/assets/resources/map/richsoil/map.tmx +++ b/frontend/assets/resources/map/richsoil/map.tmx @@ -1,5 +1,5 @@ - + @@ -33,7 +33,7 @@ - + @@ -271,29 +271,29 @@ - + - + - + - + - + - + - + - + diff --git a/frontend/assets/resources/map/pacman.meta b/frontend/assets/resources/map/simple.meta similarity index 63% rename from frontend/assets/resources/map/pacman.meta rename to frontend/assets/resources/map/simple.meta index 61cb490..c61bab7 100644 --- a/frontend/assets/resources/map/pacman.meta +++ b/frontend/assets/resources/map/simple.meta @@ -1,6 +1,6 @@ { "ver": "1.0.1", - "uuid": "33d33d2f-5ca7-4677-9c82-4ced71aa0f8a", + "uuid": "6955a517-3fb6-4777-b8b0-74dbd76f18e4", "isSubpackage": false, "subpackageName": "", "subMetas": {} diff --git a/frontend/assets/resources/map/simple/BackgroundMap.meta b/frontend/assets/resources/map/simple/BackgroundMap.meta index 803aefb..f301090 100644 --- a/frontend/assets/resources/map/simple/BackgroundMap.meta +++ b/frontend/assets/resources/map/simple/BackgroundMap.meta @@ -1,6 +1,6 @@ { "ver": "1.0.1", - "uuid": "2f0bdedd-7215-4462-ae54-b71c054cffbe", + "uuid": "51c54820-d753-4be8-a855-5760eed8f7ef", "isSubpackage": false, "subpackageName": "", "subMetas": {} diff --git a/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H128_S01.png.meta b/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H128_S01.png.meta index 2b8a57f..9e0b5d4 100644 --- a/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H128_S01.png.meta +++ b/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H128_S01.png.meta @@ -1,6 +1,6 @@ { "ver": "2.3.3", - "uuid": "c71de11b-4efc-4b7a-bbc7-eb926d08baf6", + "uuid": "136d09e9-c33c-45dc-abb7-e367d730c814", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", @@ -11,8 +11,8 @@ "subMetas": { "Tile_W256_H128_S01": { "ver": "1.0.4", - "uuid": "b4fba8f6-ffc7-468b-9086-ec855c73388a", - "rawTextureUuid": "c71de11b-4efc-4b7a-bbc7-eb926d08baf6", + "uuid": "7acc48f5-d9c9-4438-8794-57a85590bd97", + "rawTextureUuid": "136d09e9-c33c-45dc-abb7-e367d730c814", "trimType": "auto", "trimThreshold": 1, "rotated": false, diff --git a/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H128_S01.tsx.meta b/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H128_S01.tsx.meta index 57602b0..7bf46fd 100644 --- a/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H128_S01.tsx.meta +++ b/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H128_S01.tsx.meta @@ -1,5 +1,5 @@ { "ver": "2.0.0", - "uuid": "356c1165-6c15-40fe-95d0-baf11b053ada", + "uuid": "df775ad6-885e-411b-8b2a-f4bcf70b4fbf", "subMetas": {} } \ No newline at end of file diff --git a/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H256_S01.png.meta b/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H256_S01.png.meta index 5a0efc8..5e7d764 100644 --- a/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H256_S01.png.meta +++ b/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H256_S01.png.meta @@ -1,6 +1,6 @@ { "ver": "2.3.3", - "uuid": "ad433d85-5c88-4067-b4b7-129be0f54d57", + "uuid": "d8e6c175-1f17-48df-a0aa-cdd9785f4d3a", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", @@ -11,8 +11,8 @@ "subMetas": { "Tile_W256_H256_S01": { "ver": "1.0.4", - "uuid": "6c14c41c-4946-4992-b75d-8b580de43c83", - "rawTextureUuid": "ad433d85-5c88-4067-b4b7-129be0f54d57", + "uuid": "4a23290b-bf5a-4849-ac19-6ebd4b7daa59", + "rawTextureUuid": "d8e6c175-1f17-48df-a0aa-cdd9785f4d3a", "trimType": "auto", "trimThreshold": 1, "rotated": false, diff --git a/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H256_S01.tsx.meta b/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H256_S01.tsx.meta index 6641c22..2d0a3ba 100644 --- a/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H256_S01.tsx.meta +++ b/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H256_S01.tsx.meta @@ -1,5 +1,5 @@ { "ver": "2.0.0", - "uuid": "e76fd642-3e97-4917-b6c7-0fc679a17644", + "uuid": "81508f64-031d-4d00-9aa0-8e9841907d0a", "subMetas": {} } \ No newline at end of file diff --git a/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H256_S02.png.meta b/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H256_S02.png.meta index b6214bf..5f2b118 100644 --- a/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H256_S02.png.meta +++ b/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H256_S02.png.meta @@ -1,6 +1,6 @@ { "ver": "2.3.3", - "uuid": "2a91275b-bb80-44b8-9932-0913c465e4ea", + "uuid": "74245e28-6cec-4960-ac41-5b482ad8fd13", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", @@ -11,8 +11,8 @@ "subMetas": { "Tile_W256_H256_S02": { "ver": "1.0.4", - "uuid": "55ca9649-0476-4fdb-9faa-3721ec0a0d5a", - "rawTextureUuid": "2a91275b-bb80-44b8-9932-0913c465e4ea", + "uuid": "8fc46c1f-6fb4-4290-99f3-b773b92312b7", + "rawTextureUuid": "74245e28-6cec-4960-ac41-5b482ad8fd13", "trimType": "auto", "trimThreshold": 1, "rotated": false, diff --git a/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H256_S02.tsx.meta b/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H256_S02.tsx.meta index a9a32f1..64e0d82 100644 --- a/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H256_S02.tsx.meta +++ b/frontend/assets/resources/map/simple/BackgroundMap/Tile_W256_H256_S02.tsx.meta @@ -1,5 +1,5 @@ { "ver": "2.0.0", - "uuid": "0f6bb2a2-d39f-4055-a636-4e6dc3472a18", + "uuid": "4e822a8b-f3be-4b83-b61d-9e04c56c5eba", "subMetas": {} } \ No newline at end of file diff --git a/frontend/assets/resources/map/simple/BackgroundMap/map.tmx.meta b/frontend/assets/resources/map/simple/BackgroundMap/map.tmx.meta index 31fac2c..fe35ec2 100644 --- a/frontend/assets/resources/map/simple/BackgroundMap/map.tmx.meta +++ b/frontend/assets/resources/map/simple/BackgroundMap/map.tmx.meta @@ -1,5 +1,5 @@ { "ver": "2.0.2", - "uuid": "e310a2ad-1d44-41ed-858a-380474175aed", + "uuid": "a9a02975-8df5-42a1-bc25-b0ff7c1c03ba", "subMetas": {} } \ No newline at end of file diff --git a/frontend/assets/resources/map/simple/Tile_W300_H300_S01.png.meta b/frontend/assets/resources/map/simple/Tile_W300_H300_S01.png.meta index 360d33c..c6f885f 100644 --- a/frontend/assets/resources/map/simple/Tile_W300_H300_S01.png.meta +++ b/frontend/assets/resources/map/simple/Tile_W300_H300_S01.png.meta @@ -1,6 +1,6 @@ { "ver": "2.3.3", - "uuid": "b6b4c575-6690-4f1d-8165-a0098509066c", + "uuid": "c30bd4d7-efdc-410c-8bdf-4a3dfc77bebd", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", @@ -11,8 +11,8 @@ "subMetas": { "Tile_W300_H300_S01": { "ver": "1.0.4", - "uuid": "8844352b-c6ac-4f30-8c8a-83955b2241b1", - "rawTextureUuid": "b6b4c575-6690-4f1d-8165-a0098509066c", + "uuid": "66b49304-7b5b-442c-92a5-d2b368abf659", + "rawTextureUuid": "c30bd4d7-efdc-410c-8bdf-4a3dfc77bebd", "trimType": "auto", "trimThreshold": 1, "rotated": false, diff --git a/frontend/assets/resources/map/simple/Tile_W300_H300_S01.tsx.meta b/frontend/assets/resources/map/simple/Tile_W300_H300_S01.tsx.meta index 2e5add5..b71ef1b 100644 --- a/frontend/assets/resources/map/simple/Tile_W300_H300_S01.tsx.meta +++ b/frontend/assets/resources/map/simple/Tile_W300_H300_S01.tsx.meta @@ -1,5 +1,5 @@ { "ver": "2.0.0", - "uuid": "e8f0b0b6-6274-4931-bf88-af35ca68c4cc", + "uuid": "8c8beea4-faa3-4270-aa27-dc5f2b7766c2", "subMetas": {} } \ No newline at end of file diff --git a/frontend/assets/resources/map/simple/Tile_W64_H64_S01.png.meta b/frontend/assets/resources/map/simple/Tile_W64_H64_S01.png.meta index c9d78ad..9411884 100644 --- a/frontend/assets/resources/map/simple/Tile_W64_H64_S01.png.meta +++ b/frontend/assets/resources/map/simple/Tile_W64_H64_S01.png.meta @@ -1,6 +1,6 @@ { "ver": "2.3.3", - "uuid": "a6ef7a2f-0696-49d7-8e62-d2e495a2d032", + "uuid": "dd454e0f-4474-4801-8e86-ba134f6293a9", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", @@ -11,8 +11,8 @@ "subMetas": { "Tile_W64_H64_S01": { "ver": "1.0.4", - "uuid": "f6779fb1-4117-459a-a175-ff9f3abf1545", - "rawTextureUuid": "a6ef7a2f-0696-49d7-8e62-d2e495a2d032", + "uuid": "e287ce95-457a-48b3-9c94-314bbcb69009", + "rawTextureUuid": "dd454e0f-4474-4801-8e86-ba134f6293a9", "trimType": "auto", "trimThreshold": 1, "rotated": false, diff --git a/frontend/assets/resources/map/simple/Tile_W64_H64_S01.tsx.meta b/frontend/assets/resources/map/simple/Tile_W64_H64_S01.tsx.meta index b685e20..d80bf2e 100644 --- a/frontend/assets/resources/map/simple/Tile_W64_H64_S01.tsx.meta +++ b/frontend/assets/resources/map/simple/Tile_W64_H64_S01.tsx.meta @@ -1,5 +1,5 @@ { "ver": "2.0.0", - "uuid": "04f5911f-c460-41ee-8a6c-c1fec92fdcfe", + "uuid": "c63de1bc-6d0e-467e-848b-f5c021a1b950", "subMetas": {} } \ No newline at end of file diff --git a/frontend/assets/resources/map/simple/map.tmx.meta b/frontend/assets/resources/map/simple/map.tmx.meta index 062b61a..2e34feb 100644 --- a/frontend/assets/resources/map/simple/map.tmx.meta +++ b/frontend/assets/resources/map/simple/map.tmx.meta @@ -1,5 +1,5 @@ { "ver": "2.0.2", - "uuid": "0fe4d0fd-d537-4440-93f7-fffda8897ab1", + "uuid": "9b8777b4-8725-46ea-96c0-d580e9f023d1", "subMetas": {} } \ No newline at end of file diff --git a/frontend/assets/resources/map/simple2/BackgroundMap.meta b/frontend/assets/resources/map/simple2/BackgroundMap.meta deleted file mode 100644 index 803aefb..0000000 --- a/frontend/assets/resources/map/simple2/BackgroundMap.meta +++ /dev/null @@ -1,7 +0,0 @@ -{ - "ver": "1.0.1", - "uuid": "2f0bdedd-7215-4462-ae54-b71c054cffbe", - "isSubpackage": false, - "subpackageName": "", - "subMetas": {} -} \ No newline at end of file diff --git a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H128_S01.png b/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H128_S01.png deleted file mode 100644 index b651445..0000000 Binary files a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H128_S01.png and /dev/null differ diff --git a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H128_S01.png.meta b/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H128_S01.png.meta deleted file mode 100644 index 2b8a57f..0000000 --- a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H128_S01.png.meta +++ /dev/null @@ -1,34 +0,0 @@ -{ - "ver": "2.3.3", - "uuid": "c71de11b-4efc-4b7a-bbc7-eb926d08baf6", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "platformSettings": {}, - "subMetas": { - "Tile_W256_H128_S01": { - "ver": "1.0.4", - "uuid": "b4fba8f6-ffc7-468b-9086-ec855c73388a", - "rawTextureUuid": "c71de11b-4efc-4b7a-bbc7-eb926d08baf6", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 831, - "trimX": 0, - "trimY": 0, - "width": 2048, - "height": 386, - "rawWidth": 2048, - "rawHeight": 2048, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H128_S01.tsx b/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H128_S01.tsx deleted file mode 100644 index 2d6b910..0000000 --- a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H128_S01.tsx +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H128_S01.tsx.meta b/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H128_S01.tsx.meta deleted file mode 100644 index 57602b0..0000000 --- a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H128_S01.tsx.meta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ver": "2.0.0", - "uuid": "356c1165-6c15-40fe-95d0-baf11b053ada", - "subMetas": {} -} \ No newline at end of file diff --git a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S01.png b/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S01.png deleted file mode 100644 index 45aa8ef..0000000 Binary files a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S01.png and /dev/null differ diff --git a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S01.png.meta b/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S01.png.meta deleted file mode 100644 index 5a0efc8..0000000 --- a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S01.png.meta +++ /dev/null @@ -1,34 +0,0 @@ -{ - "ver": "2.3.3", - "uuid": "ad433d85-5c88-4067-b4b7-129be0f54d57", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "platformSettings": {}, - "subMetas": { - "Tile_W256_H256_S01": { - "ver": "1.0.4", - "uuid": "6c14c41c-4946-4992-b75d-8b580de43c83", - "rawTextureUuid": "ad433d85-5c88-4067-b4b7-129be0f54d57", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 64, - "width": 1280, - "height": 896, - "rawWidth": 1280, - "rawHeight": 1024, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S01.tsx b/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S01.tsx deleted file mode 100644 index b57d090..0000000 --- a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S01.tsx +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S01.tsx.meta b/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S01.tsx.meta deleted file mode 100644 index 6641c22..0000000 --- a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S01.tsx.meta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ver": "2.0.0", - "uuid": "e76fd642-3e97-4917-b6c7-0fc679a17644", - "subMetas": {} -} \ No newline at end of file diff --git a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S02.png b/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S02.png deleted file mode 100644 index 8ddf7ff..0000000 Binary files a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S02.png and /dev/null differ diff --git a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S02.png.meta b/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S02.png.meta deleted file mode 100644 index b6214bf..0000000 --- a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S02.png.meta +++ /dev/null @@ -1,34 +0,0 @@ -{ - "ver": "2.3.3", - "uuid": "2a91275b-bb80-44b8-9932-0913c465e4ea", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "platformSettings": {}, - "subMetas": { - "Tile_W256_H256_S02": { - "ver": "1.0.4", - "uuid": "55ca9649-0476-4fdb-9faa-3721ec0a0d5a", - "rawTextureUuid": "2a91275b-bb80-44b8-9932-0913c465e4ea", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 19.5, - "offsetY": 3.5, - "trimX": 89, - "trimY": 0, - "width": 1409, - "height": 251, - "rawWidth": 1548, - "rawHeight": 258, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S02.tsx b/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S02.tsx deleted file mode 100644 index 0f34291..0000000 --- a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S02.tsx +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S02.tsx.meta b/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S02.tsx.meta deleted file mode 100644 index a9a32f1..0000000 --- a/frontend/assets/resources/map/simple2/BackgroundMap/Tile_W256_H256_S02.tsx.meta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ver": "2.0.0", - "uuid": "0f6bb2a2-d39f-4055-a636-4e6dc3472a18", - "subMetas": {} -} \ No newline at end of file diff --git a/frontend/assets/resources/map/simple2/BackgroundMap/map.tmx b/frontend/assets/resources/map/simple2/BackgroundMap/map.tmx deleted file mode 100644 index 4b1c9cf..0000000 --- a/frontend/assets/resources/map/simple2/BackgroundMap/map.tmx +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - eJztmNsOAyEIRNXem97+/2urSU0MEbs2A9XIwzwtuocJLrjBORdMJpPJtIyeUZeKHhtiaJwWW9I+alfRuVh/ZWJoHJqZY2tpK/dJyPfWOxHcUvxa3Oi6eUUdmHd4sLLv0p570P6h4NbwfHRuzvMZuGuez8Bd83wWbur5LNyZ/fbRyNypz3PfUzR39uPesYZ7lmo692AqNDdyTatHo7mR88m3Po/ktj4/L3fr3jAyt+a5NG7974nN33y9SNzTJObvPD9wdYOS1D+VMgcujyOJaYmuR/bMWj1yefTMdNz5kfIceSZruffk/U9uLRn3etzoO5JxG/cq3P7H/bfu/QamEBWW - - - - - eJztmdEKwyAMRfsXjv7/h449CEWSNNFrvMoOlIHdktMsWtddl8xtHNb7NKx4nhhW7DaHRAk6eK9Lyh/5bCR+SxHyIvB6M+LpQUbevFmR1oP6ankX41wP0XjWOsaM5o3kA473Q+uTmTkRvHkzot2nmdH6mGlOSmtMpjdyjuxQb4mIN9OaYnkzs5t3uyduiXij9ygedqv3k6g3y/xE1zvruk7rEzZ36Xvs3X+vWEueZPxumMHfO5dTvOsYm7tnTaljbO4t1rNaZvcTnxHW82zuXic294gLwh21P4i6MNU96oF0H9mz9zr0+ve6tj02UruVfTOad5U7Iifi/0JtTOsrVL2y647MleU+I8+ddMwge55+AUD0Fwk= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/assets/resources/map/simple2/BackgroundMap/map.tmx.meta b/frontend/assets/resources/map/simple2/BackgroundMap/map.tmx.meta deleted file mode 100644 index 31fac2c..0000000 --- a/frontend/assets/resources/map/simple2/BackgroundMap/map.tmx.meta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ver": "2.0.2", - "uuid": "e310a2ad-1d44-41ed-858a-380474175aed", - "subMetas": {} -} \ No newline at end of file diff --git a/frontend/assets/resources/map/simple2/Tile_W300_H300_S01.png b/frontend/assets/resources/map/simple2/Tile_W300_H300_S01.png deleted file mode 100644 index 3200517..0000000 Binary files a/frontend/assets/resources/map/simple2/Tile_W300_H300_S01.png and /dev/null differ diff --git a/frontend/assets/resources/map/simple2/Tile_W300_H300_S01.png.meta b/frontend/assets/resources/map/simple2/Tile_W300_H300_S01.png.meta deleted file mode 100644 index 360d33c..0000000 --- a/frontend/assets/resources/map/simple2/Tile_W300_H300_S01.png.meta +++ /dev/null @@ -1,34 +0,0 @@ -{ - "ver": "2.3.3", - "uuid": "b6b4c575-6690-4f1d-8165-a0098509066c", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "platformSettings": {}, - "subMetas": { - "Tile_W300_H300_S01": { - "ver": "1.0.4", - "uuid": "8844352b-c6ac-4f30-8c8a-83955b2241b1", - "rawTextureUuid": "b6b4c575-6690-4f1d-8165-a0098509066c", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 4, - "offsetY": -24.5, - "trimX": 97, - "trimY": 85, - "width": 114, - "height": 179, - "rawWidth": 300, - "rawHeight": 300, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/frontend/assets/resources/map/simple2/Tile_W300_H300_S01.tsx b/frontend/assets/resources/map/simple2/Tile_W300_H300_S01.tsx deleted file mode 100644 index d958003..0000000 --- a/frontend/assets/resources/map/simple2/Tile_W300_H300_S01.tsx +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/frontend/assets/resources/map/simple2/Tile_W300_H300_S01.tsx.meta b/frontend/assets/resources/map/simple2/Tile_W300_H300_S01.tsx.meta deleted file mode 100644 index 2e5add5..0000000 --- a/frontend/assets/resources/map/simple2/Tile_W300_H300_S01.tsx.meta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ver": "2.0.0", - "uuid": "e8f0b0b6-6274-4931-bf88-af35ca68c4cc", - "subMetas": {} -} \ No newline at end of file diff --git a/frontend/assets/resources/map/simple2/Tile_W64_H64_S01.png b/frontend/assets/resources/map/simple2/Tile_W64_H64_S01.png deleted file mode 100644 index 1b7cb9d..0000000 Binary files a/frontend/assets/resources/map/simple2/Tile_W64_H64_S01.png and /dev/null differ diff --git a/frontend/assets/resources/map/simple2/Tile_W64_H64_S01.png.meta b/frontend/assets/resources/map/simple2/Tile_W64_H64_S01.png.meta deleted file mode 100644 index c9d78ad..0000000 --- a/frontend/assets/resources/map/simple2/Tile_W64_H64_S01.png.meta +++ /dev/null @@ -1,34 +0,0 @@ -{ - "ver": "2.3.3", - "uuid": "a6ef7a2f-0696-49d7-8e62-d2e495a2d032", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "platformSettings": {}, - "subMetas": { - "Tile_W64_H64_S01": { - "ver": "1.0.4", - "uuid": "f6779fb1-4117-459a-a175-ff9f3abf1545", - "rawTextureUuid": "a6ef7a2f-0696-49d7-8e62-d2e495a2d032", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 256, - "height": 256, - "rawWidth": 256, - "rawHeight": 256, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/frontend/assets/resources/map/simple2/Tile_W64_H64_S01.tsx b/frontend/assets/resources/map/simple2/Tile_W64_H64_S01.tsx deleted file mode 100644 index 319467a..0000000 --- a/frontend/assets/resources/map/simple2/Tile_W64_H64_S01.tsx +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/assets/resources/map/simple2/Tile_W64_H64_S01.tsx.meta b/frontend/assets/resources/map/simple2/Tile_W64_H64_S01.tsx.meta deleted file mode 100644 index b685e20..0000000 --- a/frontend/assets/resources/map/simple2/Tile_W64_H64_S01.tsx.meta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ver": "2.0.0", - "uuid": "04f5911f-c460-41ee-8a6c-c1fec92fdcfe", - "subMetas": {} -} \ No newline at end of file diff --git a/frontend/assets/resources/map/simple2/map.tmx b/frontend/assets/resources/map/simple2/map.tmx deleted file mode 100644 index 9bddc2f..0000000 --- a/frontend/assets/resources/map/simple2/map.tmx +++ /dev/null @@ -1,310 +0,0 @@ - - - - - - - eJztz0ENACAMALGR4F8zNspyjwronZm7xPlcD0sPSw9LD0sPSw9LD0sPSw9LD0sPSw9LD0sPSw9LD0sPSw9LD0sPSw9LD0sPy7bHBg/ldQwR - - - - - - - - - - - - - eJztWctuBCEMW7Vqt9v2/7+32gMSQnnYTmB6WB+ZwZmEkHHgdnuBxe8/5WLwcyHXuzH2ccAuw5Wty3j/bjyzxlC7M9iYrFxZfNbnqi/IOqAxqfow8AWOoXZmZL58k9xvzrg1L+JS9oO6LijfCR882yvWdUH5rG+KuBgfrFo42+7CJ/m+l5MWoloYjZ+CUsN2+OLVc0YDRPa9nNzhC7LPs//Xo8FuNs5wRvt2Rw7v8AXZ5zty2FvL3Xsf4e+qsVf60l1jq754MR2w8qFSY6MaqdSRJ7KYRnNWIL509iseZ4de93TyHZirwOOM1lXtC6JnSg+K2FPnVHSysr9P+4Dq8a5+Wp2jcHq5FPWgFXuZXu/sqxCuHX1cR+1BtN4A0y96/ycldiu8XOquxWhNOZ1LDFA+RCdn/4OOeFjw9nLl/5TVUPZ8YIX3bSd6z26w33zKl0xzM/xd2hvhnKFo7ox/h/ZmtOcpXzp1q6K5PXjfjPSAKJcF9jwXQdd9B8q1E8pZYUW3zlBqVYSOPRatm1XjKrUqQsUXties1qqs9kd8im5l7ovQnOzYr0wuWc+YOz7kvcq6ILkU9ZOqhmfvdj17M6rn3ayGV30YUM8qB6qxeIK9n96FaixmXOVDJ3bomRc4/AGscghn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/assets/resources/map/simple2/map.tmx.meta b/frontend/assets/resources/map/simple2/map.tmx.meta deleted file mode 100644 index 062b61a..0000000 --- a/frontend/assets/resources/map/simple2/map.tmx.meta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ver": "2.0.2", - "uuid": "0fe4d0fd-d537-4440-93f7-fffda8897ab1", - "subMetas": {} -} \ No newline at end of file diff --git a/frontend/assets/scenes/login.fire b/frontend/assets/scenes/login.fire index 5cbb696..6324f99 100644 --- a/frontend/assets/scenes/login.fire +++ b/frontend/assets/scenes/login.fire @@ -440,7 +440,7 @@ "array": [ 0, 0, - 210.4441731196186, + 209.57814771583418, 0, 0, 0, diff --git a/frontend/assets/scripts/Map.js b/frontend/assets/scripts/Map.js index b63252c..42579ac 100644 --- a/frontend/assets/scripts/Map.js +++ b/frontend/assets/scripts/Map.js @@ -414,7 +414,6 @@ cc.Class({ /** Init required prefab ended. */ window.handleBattleColliderInfo = function(parsedBattleColliderInfo) { - console.log("Colliders=", parsedBattleColliderInfo); self.inputDelayFrames = parsedBattleColliderInfo.inputDelayFrames; self.inputScaleFrames = parsedBattleColliderInfo.inputScaleFrames; self.inputFrameUpsyncDelayTolerance = parsedBattleColliderInfo.inputFrameUpsyncDelayTolerance;