diff --git a/game_config.json b/game_config.json index 3bcff5f..f9f7fea 100644 --- a/game_config.json +++ b/game_config.json @@ -18,7 +18,7 @@ "type": "int", "min": -1, "max": 100, - "default": -1, + "default": 1, "help": "選定內建關卡,請注意,使用此設定將會覆蓋掉其他關卡設定,預設為 -1 不選擇任何關卡。" }, { "name": "level_file", diff --git a/src/env.py b/src/env.py index 8da9abd..17213fb 100644 --- a/src/env.py +++ b/src/env.py @@ -66,17 +66,22 @@ GARBAGE01_PATH = path.join(ASSET_IMAGE_DIR, "garbage_01.png") GARBAGE02_PATH = path.join(ASSET_IMAGE_DIR, "garbage_02.png") GARBAGE03_PATH = path.join(ASSET_IMAGE_DIR, "garbage_03.png") -# TODO check url -BG_URL = BG_PATH -SQUID_URL = SQUID_PATH -FOOD01_L_URL = FOOD01_L_PATH -FOOD02_L_URL = FOOD02_L_PATH -FOOD03_L_URL = FOOD03_L_PATH -FOOD01_R_URL = FOOD01_R_PATH -FOOD02_R_URL = FOOD02_R_PATH -FOOD03_R_URL = FOOD03_R_PATH -GARBAGE01_URL = GARBAGE01_PATH -GARBAGE02_URL = GARBAGE02_PATH -GARBAGE03_URL = GARBAGE03_PATH + +ASSET_IMG_URL = "https://raw.githubusercontent.com/PAIA-Playful-AI-Arena/easy_game/main/asset/img/" +BG_URL = ASSET_IMG_URL + "background.png" +SQUID_URL = ASSET_IMG_URL + "squid.png" +# Food URLs +FOOD01_L_URL = ASSET_IMG_URL + "food_01_L.png" +FOOD02_L_URL = ASSET_IMG_URL + "food_02_L.png" # Assuming the naming pattern is similar +FOOD03_L_URL = ASSET_IMG_URL + "food_03_L.png" +FOOD01_R_URL = ASSET_IMG_URL + "food_01_R.png" +FOOD02_R_URL = ASSET_IMG_URL + "food_02_R.png" +FOOD03_R_URL = ASSET_IMG_URL + "food_03_R.png" + +# Garbage URLs +GARBAGE01_URL = ASSET_IMG_URL + "garbage_01.png" +GARBAGE02_URL = ASSET_IMG_URL + "garbage_02.png" +GARBAGE03_URL = ASSET_IMG_URL + "garbage_03.png" # BAR_URL = "https://raw.githubusercontent.com/PAIA/dont_touch/master/asset/image/bar.png" +# https://raw.githubusercontent.com/PAIA-Playful-AI-Arena/easy_game/main/asset/img/background.jpg \ No newline at end of file diff --git a/src/game.py b/src/game.py index 8994945..3ce88ad 100644 --- a/src/game.py +++ b/src/game.py @@ -6,7 +6,6 @@ import pygame from mlgame.game.paia_game import PaiaGame, GameResultState, GameStatus from mlgame.utils.enum import get_ai_name -from mlgame.utils.prof import timeit_in_perf from mlgame.view.decorator import check_game_progress, check_game_result from mlgame.view.view_model import * from .env import *