Merge pull request #66 from ligen131/fix-20240228-small-bugs

Fix: 若干小 bug 修复

bg/dynamic_bg/dynamic_bg.gd

@@ -38,7 +38,7 @@ func set_victory(v: bool):
 func _ready():
 	var x_offset = 0
 	var y_offset = 0
-	self.color = ImageLib.get_palette_color_by_name("darkest")
+	self.color = ImageLib.get_palette_color_by_info("blue", "darkest")
 
 	while HEIGHT + y_offset + (WIDTH / W_STEP) * H_STEP > -50:
 		spawn(x_offset, y_offset)

levels/base_level/base_level.gd

@@ -192,8 +192,8 @@ func _on_next_level_button_pressed():
 		level_menu.init(chap_id)
 	else:
 		var base_level = BaseLevelScn.instantiate()
-		base_level.init(chap_id, lvl_id)
 		get_tree().root.add_child(base_level)
+		base_level.init(chap_id, lvl_id + 1)
 	queue_free()
 
 func _on_replay_button_pressed():

objects/block/block.gd

@@ -43,6 +43,9 @@ func set_card(card: Card) -> void:
 	assert(not self.is_fixed, "void Block::set_card(card: Card) should only be called when is_fixed is false.")
 	if self.occupied_card != card:
 		self.occupied_card = card
+		if card != null:
+			card.position = self.position
+			card.current_block = self
 		occupied_card_changed.emit(self)
 
 

objects/card/card.gd

@@ -55,17 +55,16 @@ func put_down():
 
 		if old_card != null: # 若原来占有的卡非空，则进行交换
 			if self.last_block != null: # 若当前 Card 之前占用了 Block，则将该 Block 占用的 Card 放置在原先的位置上
-				old_card.position = self.last_block.position
 				self.last_block.set_card(old_card)
 			else: # 若当前 Card 是由 CardBase 生成的，则将该 Block 占用的 Card 释放
 				old_card.queue_free()
 
-		self.current_block = entered_block
-		self.position = entered_block.position
 		self.is_dragging = false  
+
 		self.last_block = null
 
 		$SFXPutDown.play() 
+
 
 	else:
 		queue_free()