diff --git a/battle_srv/Makefile b/battle_srv/Makefile index 5056d08..d17432b 100644 --- a/battle_srv/Makefile +++ b/battle_srv/Makefile @@ -1,6 +1,7 @@ PROJECTNAME=server.exe ROOT_DIR=. -GOPROXY=https://mirrors.aliyun.com/goproxy +#GOPROXY=https://mirrors.aliyun.com/goproxy +GOPROXY=https://goproxy.io all: help gen-constants: diff --git a/battle_srv/start_daemon.sh b/battle_srv/start_daemon.sh index 67670cd..23d017c 100644 --- a/battle_srv/start_daemon.sh +++ b/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 diff --git a/collider_visualizer/Makefile b/collider_visualizer/Makefile index 256e47d..95561d4 100644 --- a/collider_visualizer/Makefile +++ b/collider_visualizer/Makefile @@ -2,7 +2,8 @@ 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: GOPROXY=$(GOPROXY) go build -o $(ROOT_DIR)/$(PROJECTNAME) diff --git a/frontend/assets/scenes/login.fire b/frontend/assets/scenes/login.fire index e5bc0e5..8e744bd 100644 --- a/frontend/assets/scenes/login.fire +++ b/frontend/assets/scenes/login.fire @@ -440,7 +440,7 @@ "array": [ 0, 0, - 216.19964242526865, + 215.64032554232523, 0, 0, 0, diff --git a/frontend/assets/scripts/Map.js b/frontend/assets/scripts/Map.js index 37c2bf3..bcfce80 100644 --- a/frontend/assets/scripts/Map.js +++ b/frontend/assets/scripts/Map.js @@ -347,7 +347,6 @@ cc.Class({ const mapNode = self.node; const canvasNode = mapNode.parent; - cc.director.getCollisionManager().enabled = false; // self.musicEffectManagerScriptIns = self.node.getComponent("MusicEffectManager"); self.musicEffectManagerScriptIns = null; diff --git a/frontend/assets/scripts/OfflineMap.js b/frontend/assets/scripts/OfflineMap.js index a87760d..72272a9 100644 --- a/frontend/assets/scripts/OfflineMap.js +++ b/frontend/assets/scripts/OfflineMap.js @@ -15,8 +15,6 @@ cc.Class({ window.mapIns = self; self.showCriticalCoordinateLabels = true; - cc.director.getCollisionManager().enabled = false; - const mapNode = self.node; const canvasNode = mapNode.parent; diff --git a/frontend/settings/builder.json b/frontend/settings/builder.json index 5d21f7b..168d9c7 100644 --- a/frontend/settings/builder.json +++ b/frontend/settings/builder.json @@ -17,13 +17,13 @@ }, "encryptJs": true, "excludeScenes": [ - "475b849b-44b3-4390-982d-bd0d9e695093" + "368b10b6-88fc-423c-9fcd-545d9fc673bd" ], "fb-instant-games": {}, "includeSDKBox": false, "inlineSpriteFrames": true, "inlineSpriteFrames_native": true, - "md5Cache": true, + "md5Cache": false, "mergeStartScene": true, "optimizeHotUpdate": false, "orientation": { diff --git a/frontend/settings/project.json b/frontend/settings/project.json index b5a6c89..7d067aa 100644 --- a/frontend/settings/project.json +++ b/frontend/settings/project.json @@ -34,7 +34,6 @@ "design-resolution-width": 960, "excluded-modules": [ "Collider", - "DragonBones", "Geom Utils", "Mesh", "MotionStreak", @@ -69,7 +68,7 @@ "shelter_z_reducer", "shelter" ], - "last-module-event-record-time": 1579766511782, + "last-module-event-record-time": 1671346284377, "simulator-orientation": false, "simulator-resolution": { "height": 640,