Merge pull request #3 from xushiwei/q

spx v1.0.0
goplus · Mar 14, 2024 · 3d49c72 · 3d49c72
2 parents 07316ef + 9757276
commit 3d49c72
Show file tree

Hide file tree

Showing 19 changed files with 129 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,3 @@
-gop_autogen*.go
-gop.mod
 .gop/
 .DS_Store
 
@@ -18,4 +16,5 @@ gop.mod
 
 # Dependency directories (remove the comment below to include it)
 # vendor/
-gop_autogen.go
+MazePlay*
+go.work*
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-MazePlay - a game powered by Go+ spx game engine
+MazePlay - powered by Go+ Builder
 =========
 
 [![Language](https://img.shields.io/badge/language-Go+-blue.svg)](https://github.com/goplus/gop)
@@ -9,8 +9,8 @@ MazePlay - a game powered by Go+ spx game engine
 
 ### How to run
 
-- Download Go+ and build it. See https://github.com/goplus/gop#how-to-build.
+- Install Go+. See https://github.com/goplus/gop#how-to-install.
 - Download this game and run.
   * git clone https://github.com/goplus/MazePlay.git
   * cd MazePlay
-  * ./run.sh
+  * gop run .
diff --git a/res/1.jpg → assets/1.jpg b/res/1.jpg → assets/1.jpg
diff --git a/res/img/backdrop1.png → assets/img/backdrop1.png b/res/img/backdrop1.png → assets/img/backdrop1.png
diff --git a/res/img/costume1.png → assets/img/costume1.png b/res/img/costume1.png → assets/img/costume1.png
diff --git a/res/img/m.png → assets/img/m.png b/res/img/m.png → assets/img/m.png
diff --git a/res/img/niu.png → assets/img/niu.png b/res/img/niu.png → assets/img/niu.png
diff --git a/res/index.json → assets/index.json b/res/index.json → assets/index.json
diff --git a/res/sounds/mhit/index.json → assets/sounds/mhit/index.json b/res/sounds/mhit/index.json → assets/sounds/mhit/index.json
diff --git a/res/sounds/mhit/sfx_hit.wav → assets/sounds/mhit/sfx_hit.wav b/res/sounds/mhit/sfx_hit.wav → assets/sounds/mhit/sfx_hit.wav
diff --git a/res/sprites/Calf/index.json → assets/sprites/Calf/index.json b/res/sprites/Calf/index.json → assets/sprites/Calf/index.json
diff --git a/res/sprites/Maze/index.json → assets/sprites/Maze/index.json b/res/sprites/Maze/index.json → assets/sprites/Maze/index.json
diff --git a/res/sprites/Red/index.json → assets/sprites/Red/index.json b/res/sprites/Red/index.json → assets/sprites/Red/index.json
diff --git a/dummy/dummy.go b/dummy/dummy.go
diff --git a/go.mod b/go.mod
@@ -1,10 +1,31 @@
 module github.com/goplus/MazePlay
 
-go 1.16
+go 1.18
+
+require github.com/goplus/spx v1.0.0
 
 require (
-	github.com/goplus/gop v1.0.36
-	github.com/goplus/spx v1.0.0
+	github.com/ajstarks/svgo v0.0.0-20210927141636-6d70534b1098 // indirect
+	github.com/esimov/stackblur-go v1.0.1-0.20190121110005-00e727e3c7a9 // indirect
+	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20220320163800-277f93cfa958 // indirect
+	github.com/gofrs/flock v0.8.1 // indirect
+	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
+	github.com/goplus/canvas v0.1.0 // indirect
+	github.com/hajimehoshi/ebiten/v2 v2.3.4 // indirect
+	github.com/hajimehoshi/go-mp3 v0.3.3 // indirect
+	github.com/hajimehoshi/oto/v2 v2.1.0 // indirect
+	github.com/jezek/xgb v1.0.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/qiniu/audio v0.2.1 // indirect
+	github.com/qiniu/x v1.13.9 // indirect
+	github.com/srwiley/oksvg v0.0.0-20210519022825-9fc0c575d5fe // indirect
+	github.com/srwiley/rasterx v0.0.0-20210519020934-456a8d69b780 // indirect
+	golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56 // indirect
+	golang.org/x/image v0.0.0-20220321031419-a8550c1d254a // indirect
+	golang.org/x/mobile v0.0.0-20220518205345-8578da9835fd // indirect
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
+	golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f // indirect
+	golang.org/x/text v0.3.7 // indirect
 )
 
 replace (

diff --git a/go.sum b/go.sum
@@ -14,9 +14,6 @@ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF0
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/goplus/canvas v0.1.0 h1:Vx3f2+U8UANvWf5/01YsQYKNbZDm1GZCjhlEBFrQkeU=
 github.com/goplus/canvas v0.1.0/go.mod h1:Rhcvo5qkpD9WuXFnvnXtrBSY97l6h7sXQuofrmiLNdM=
-github.com/goplus/gop v1.0.36 h1:XpqEwxdgbav87RoUh+goEl21UlLT4ETyw4L4Zvf1msM=
-github.com/goplus/gop v1.0.36/go.mod h1:JMjZXjcfATZdT+1SIU4bXpaXJIvs6xTNVzjI8+XQhRM=
-github.com/goplus/gox v1.8.7/go.mod h1:XWqV75HImeysI8+Q9gAdYyvwlP8jds24xsgYRwTO3JI=
 github.com/goplus/spx v1.0.0 h1:mEPqYCjYfWmRNkyq0VMDlD3XtkldDlbzCO69d/iAYro=
 github.com/goplus/spx v1.0.0/go.mod h1:/k34E8W0YobBjsjvpefJz6n1SLMgAyHIuGb1BBRwtDk=
 github.com/hajimehoshi/bitmapfont/v2 v2.2.0/go.mod h1:Llj2wTYXMuCTJEw2ATNIO6HbFPOoBYPs08qLdFAxOsQ=
@@ -26,7 +23,6 @@ github.com/hajimehoshi/file2byteslice v0.0.0-20210813153925-5340248a8f41/go.mod
 github.com/hajimehoshi/go-mp3 v0.3.2/go.mod h1:qMJj/CSDxx6CGHiZeCgbiq2DSUkbK0UbtXShQcnfyMM=
 github.com/hajimehoshi/go-mp3 v0.3.3 h1:cWnfRdpye2m9ElSoVqneYRcpt/l3ijttgjMeQh+r+FE=
 github.com/hajimehoshi/go-mp3 v0.3.3/go.mod h1:qMJj/CSDxx6CGHiZeCgbiq2DSUkbK0UbtXShQcnfyMM=
-github.com/hajimehoshi/oto v1.0.1 h1:8AMnq0Yr2YmzaiqTg/k1Yzd6IygUGk2we9nmjgbgPn4=
 github.com/hajimehoshi/oto v1.0.1/go.mod h1:wovJ8WWMfFKvP587mhHgot/MBr4DnNy9m6EepeVGnos=
 github.com/hajimehoshi/oto/v2 v2.1.0 h1:/h+UkbKzhD7xBHOQlWgKUplBPZ+J4DK3P2Y7g2UF1X4=
 github.com/hajimehoshi/oto/v2 v2.1.0/go.mod h1:9i0oYbpJ8BhVGkXDKdXKfFthX1JUNfXjeTp944W8TGM=

diff --git a/gop_autogen.go b/gop_autogen.go
diff --git a/index.gmx → main.spx b/index.gmx → main.spx
@@ -4,5 +4,3 @@ var (
 	Red  Red
 	mhit Sound
 )
-
-run "res", {Title: "MazePlay (by Go+)"}
diff --git a/run.sh b/run.sh
@@ -1,3 +1 @@
-go mod tidy
-rm -f .gop/gop.cache
-gop run . -f
+gop run .
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,5 +4,3 @@ var ( @@
     	Red  Red
     	mhit Sound
     )
-    run "res", {Title: "MazePlay (by Go+)"}