From 798b11ba1cf41c865fa171dad94703017d85c266 Mon Sep 17 00:00:00 2001 From: chendian <-> Date: Sat, 11 Nov 2023 04:36:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E6=9C=BAclamp=20=E5=85=B3=E5=8D=A1cel?= =?UTF-8?q?l=E5=A4=A7=E5=B0=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scene/level/level01_forecourt.tscn | 4 ++-- script/manager/camera_manager.gd | 2 +- setting/MetSysSettings.tres | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scene/level/level01_forecourt.tscn b/scene/level/level01_forecourt.tscn index 2e39a59..b49249d 100644 --- a/scene/level/level01_forecourt.tscn +++ b/scene/level/level01_forecourt.tscn @@ -22,6 +22,6 @@ size = Vector3(12.8, 2, 14.4) mesh_library = ExtResource("2_fqw73") cell_size = Vector3(0.64, 0.64, 0.64) data = { -"cells": PackedInt32Array(0, 0, 1048592, 1, 0, 1048592, 2, 0, 1048592, 3, 0, 1048592, 4, 0, 1048592, 5, 0, 1048592, 6, 0, 1048592, 7, 0, 1048592, 9, 0, 1048592, 10, 0, 1048592, 11, 0, 1048592, 12, 0, 1048592, 13, 0, 1048592, 14, 0, 1048592, 15, 0, 1048592, 16, 0, 1048592, 17, 0, 1048592, 18, 0, 1048592, 19, 0, 1048592, 19, 1, 1441804, 18, 1, 1441804, 17, 1, 1441804, 16, 1, 1441804, 15, 1, 1441804, 14, 1, 1441804, 13, 1, 1441804, 12, 1, 1441804, 11, 1, 1441804, 10, 1, 1441804, 9, 1, 1441804, 8, 1, 1441804, 7, 1, 1441804, 6, 1, 1441804, 0, 1, 1441804, 1, 1, 1441804, 2, 1, 1441804, 3, 1, 1441804, 4, 1, 1441804, 5, 1, 1441804, 19, 2, 1441805, 18, 2, 1441805, 17, 2, 1441805, 16, 2, 1441805, 15, 2, 1441805, 14, 2, 1441805, 13, 2, 1441805, 12, 2, 1441805, 11, 2, 1441805, 10, 2, 1441805, 9, 2, 1441805, 8, 2, 1441805, 7, 2, 1441805, 6, 2, 1441805, 5, 2, 1441805, 4, 2, 1441805, 3, 2, 1441805, 2, 2, 1441805, 1, 2, 1441805, 0, 2, 1441805, 8, 0, 1048592, 20, 1, 1441804, 20, 2, 1441805, 65544, 0, 1441808, 65543, 0, 1441808, 65542, 0, 1441808, 65541, 0, 1441808, 65540, 0, 1441808, 65539, 0, 1441808, 65538, 0, 1441808, 65537, 0, 1441808, 65547, 0, 1441808, 65548, 0, 1441808, 65549, 0, 1441808, 65550, 0, 1441808, 65551, 0, 1441808, 65552, 0, 1441808, 65553, 0, 1441808, 65554, 0, 1441808, 65555, 0, 1441808, 65536, 0, 1441808, 65535, 2, 1441805, 65535, 1, 1441804, 131080, 0, 1048592, 196616, 0, 1048592, 262152, 0, 1048592) +"cells": PackedInt32Array(0, 0, 1048592, 1, 0, 1048592, 2, 0, 1048592, 3, 0, 1048592, 4, 0, 1048592, 5, 0, 1048592, 6, 0, 1048592, 7, 0, 1048592, 9, 0, 1048592, 10, 0, 1048592, 11, 0, 1048592, 12, 0, 1048592, 13, 0, 1048592, 14, 0, 1048592, 15, 0, 1048592, 16, 0, 1048592, 17, 0, 1048592, 18, 0, 1048592, 19, 0, 1048592, 19, 1, 1441804, 18, 1, 1441804, 17, 1, 1441804, 16, 1, 1441804, 15, 1, 1441804, 14, 1, 1441804, 13, 1, 1441804, 12, 1, 1441804, 11, 1, 1441804, 10, 1, 1441804, 9, 1, 1441804, 8, 1, 1441804, 7, 1, 1441804, 6, 1, 1441804, 0, 1, 1441804, 1, 1, 1441804, 2, 1, 1441804, 3, 1, 1441804, 4, 1, 1441804, 5, 1, 1441804, 19, 2, 1441805, 18, 2, 1441805, 17, 2, 1441805, 16, 2, 1441805, 15, 2, 1441805, 14, 2, 1441805, 13, 2, 1441805, 12, 2, 1441805, 11, 2, 1441805, 10, 2, 1441805, 9, 2, 1441805, 8, 2, 1441805, 7, 2, 1441805, 6, 2, 1441805, 5, 2, 1441805, 4, 2, 1441805, 3, 2, 1441805, 2, 2, 1441805, 1, 2, 1441805, 0, 2, 1441805, 8, 0, 1048592, 20, 1, 1441804, 20, 2, 1441805, 65544, 0, 1441808, 65543, 0, 1441808, 65542, 0, 1441808, 65541, 0, 1441808, 65540, 0, 1441808, 65539, 0, 1441808, 65538, 0, 1441808, 65537, 0, 1441808, 65547, 0, 1441808, 65548, 0, 1441808, 65549, 0, 1441808, 65550, 0, 1441808, 65551, 0, 1441808, 65552, 0, 1441808, 65553, 0, 1441808, 65554, 0, 1441808, 65555, 0, 1441808, 65536, 0, 1441808, 65535, 2, 1441805, 65535, 1, 1441804, 131080, 0, 1048592, 196616, 0, 1048592, 262152, 0, 1048592, 131079, 0, 16, 131078, 0, 16, 131077, 0, 16, 131076, 0, 16, 131075, 0, 16, 131074, 0, 16, 131073, 0, 16, 131072, 0, 16, 131083, 0, 16, 131084, 0, 16, 131085, 0, 16, 131086, 0, 16, 131087, 0, 16, 131088, 0, 16, 131089, 0, 16, 131090, 0, 16, 131091, 0, 16, 196627, 0, 16, 196625, 0, 16, 196626, 0, 16, 196624, 0, 16, 196623, 0, 16, 196622, 0, 16, 196621, 0, 16, 196620, 0, 16, 196619, 0, 16, 196615, 0, 16, 196614, 0, 16, 196613, 0, 16, 196612, 0, 16, 196611, 0, 16, 196610, 0, 16, 196609, 0, 16, 196608, 0, 16, 262155, 0, 16, 262156, 0, 16, 262157, 0, 16, 262158, 0, 16, 262159, 0, 16, 262160, 0, 16, 262161, 0, 16, 262162, 0, 16, 262163, 0, 16, 262151, 0, 16, 262150, 0, 16, 262149, 0, 16, 262148, 0, 16, 262147, 0, 16, 262145, 0, 16, 262144, 0, 16, 262146, 0, 16, 262154, 0, 16, 262153, 0, 16, 0, 21, 16, 0, 20, 16) } -metadata/_editor_floor_ = Vector3(0, 4, 0) +metadata/_editor_floor_ = Vector3(0, 0, 0) diff --git a/script/manager/camera_manager.gd b/script/manager/camera_manager.gd index 1520926..409ea91 100644 --- a/script/manager/camera_manager.gd +++ b/script/manager/camera_manager.gd @@ -7,7 +7,7 @@ var target_pos_y:float var target_pos_now:Vector2 = Vector2.ZERO var level_size:Vector2 var offset:float = 5 -var camera_limit = Vector3(6.4,1.04,3.76) #x,up,z-downd +var camera_limit = Vector3(6.4,1.04,3.6) #x,up,z-downd func _ready(): Global.camera_mgr = self diff --git a/setting/MetSysSettings.tres b/setting/MetSysSettings.tres index 78b9474..0296285 100644 --- a/setting/MetSysSettings.tres +++ b/setting/MetSysSettings.tres @@ -8,5 +8,5 @@ script = ExtResource("1_l1so1") theme = ExtResource("2_nrj5e") map_root_folder = "res://scene/level" map_setting_folder = "res://setting" -in_game_cell_size = Vector2(12.8, 7.2) +in_game_cell_size = Vector2(12.8, 7.04) collectible_list = Array[Dictionary]([])