yaclty/pypvz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复拼写错误带来的笑话

Browse Source
This commit is contained in:
星外之神 2022-04-22 16:05:32 +08:00
parent 5d444371da
commit 3bcd43137a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/component/map.py
View File

@ -89,7 +89,7 @@ class Map():
if self.background_type in {c.BACKGROUND_POOL, c.BACKGROUND_FOG}: if self.background_type in {c.BACKGROUND_POOL, c.BACKGROUND_FOG}:
x -= c.MAP_POOL_OFFSET_X x -= c.MAP_POOL_OFFSET_X
y -= c.MAP_POOL_OFFSET_Y y -= c.MAP_POOL_OFFSET_Y
return (x // c.GIRD_POOL_X_SIZE, y // c.GRID_POOL_Y_SIZE) return (x // c.GRID_POOL_X_SIZE, y // c.GRID_POOL_Y_SIZE)
elif self.background_type in {c.BACKGROUND_ROOF, c.BACKGROUND_ROOFNIGHT}: elif self.background_type in {c.BACKGROUND_ROOF, c.BACKGROUND_ROOFNIGHT}:
x -= c.MAP_ROOF_OFFSET_X x -= c.MAP_ROOF_OFFSET_X
y -= c.MAP_ROOF_OFFSET_X y -= c.MAP_ROOF_OFFSET_X
@ -106,11 +106,11 @@ class Map():
def getMapGridPos(self, map_x, map_y): def getMapGridPos(self, map_x, map_y):
if self.background_type in {c.BACKGROUND_POOL, c.BACKGROUND_FOG}: if self.background_type in {c.BACKGROUND_POOL, c.BACKGROUND_FOG}:
return (map_x * c.GRID_ROOF_X_SIZE + c.GRID_X_SIZE//2 + c.MAP_ROOF_OFFSET_X, return (map_x * c.GRID_POOL_X_SIZE + c.GRID_POOL_X_SIZE//2 + c.MAP_POOL_OFFSET_X,
map_y * c.GRID_ROOF_Y_SIZE + c.GRID_Y_SIZE//5 * 3 + c.MAP_ROOF_OFFSET_Y) map_y * c.GRID_POOL_Y_SIZE + c.GRID_POOL_Y_SIZE//5 * 3 + c.MAP_POOL_OFFSET_Y)
elif self.background_type in {c.BACKGROUND_ROOF, c.BACKGROUND_ROOFNIGHT}: elif self.background_type in {c.BACKGROUND_ROOF, c.BACKGROUND_ROOFNIGHT}:
return (map_x * c.GRID_POOL_X_SIZE + c.GRID_X_SIZE//2 + c.MAP_POOL_OFFSET_X, return (map_x * c.GRID_ROOF_X_SIZE + c.GRID_ROOF_X_SIZE//2 + c.MAP_ROOF_OFFSET_X,
map_y * c.GRID_POOL_Y_SIZE + 20 * max(0, (6 - map_y)) + c.GRID_Y_SIZE//5 * 3 + c.MAP_POOL_OFFSET_Y) map_y * c.GRID_ROOF_Y_SIZE + 20 * max(0, (6 - map_y)) + c.GRID_ROOF_Y_SIZE//5 * 3 + c.MAP_POOL_OFFSET_Y)
else: else:
return (map_x * c.GRID_X_SIZE + c.GRID_X_SIZE//2 + c.MAP_OFFSET_X, return (map_x * c.GRID_X_SIZE + c.GRID_X_SIZE//2 + c.MAP_OFFSET_X,
map_y * c.GRID_Y_SIZE + c.GRID_Y_SIZE//5 * 3 + c.MAP_OFFSET_Y) map_y * c.GRID_Y_SIZE + c.GRID_Y_SIZE//5 * 3 + c.MAP_OFFSET_Y)

4
source/constants.py
View File

@ -19,7 +19,7 @@ GRID_Y_SIZE = 100
# 带有泳池 # 带有泳池
GRID_POOL_X_LEN = GRID_X_LEN GRID_POOL_X_LEN = GRID_X_LEN
GRID_POOL_Y_LEN = 6 GRID_POOL_Y_LEN = 6
GIRD_POOL_X_SIZE = GRID_X_SIZE GRID_POOL_X_SIZE = GRID_X_SIZE
GRID_POOL_Y_SIZE = 85 GRID_POOL_Y_SIZE = 85
# 屋顶 # 屋顶
GRID_ROOF_X_LEN = GRID_X_LEN GRID_ROOF_X_LEN = GRID_X_LEN
@ -106,7 +106,7 @@ MAP_STATE_TILE = {MAP_PLANT:set(), MAP_SLEEP:False, MAP_PLOT_TYPE:MAP_TILE}
BACKGROUND_OFFSET_X = 220 BACKGROUND_OFFSET_X = 220
MAP_OFFSET_X = 35 MAP_OFFSET_X = 35
MAP_OFFSET_Y = 100 MAP_OFFSET_Y = 100
MAP_POOL_OFFSET_X = 35 # 暂时还不清楚数据 MAP_POOL_OFFSET_X = 42 # 暂时还不清楚数据
MAP_POOL_OFFSET_Y = 115 # 暂时还不清楚数据 MAP_POOL_OFFSET_Y = 115 # 暂时还不清楚数据
MAP_ROOF_OFFSET_X = 35 # 暂时还不清楚数据 MAP_ROOF_OFFSET_X = 35 # 暂时还不清楚数据
MAP_ROOF_OFFSET_Y = 105 # 暂时还不清楚数据 MAP_ROOF_OFFSET_Y = 105 # 暂时还不清楚数据