refactor(EntityBase): 移除发布模式下武器子节点的释放逻辑

由于武器子节点在发布模式下隐藏而非释放，移除了冗余的queue_free调用以简化代码

.gitignore

@@ -2,4 +2,5 @@
 .codebuddy
 build/*
 !build/.gitkeep
-*.zip
+*.zip
+android

components/Characters/HCN.tscn

@@ -2,7 +2,10 @@
 
 [ext_resource type="PackedScene" uid="uid://bs863g2s8r770" path="res://components/Abstracts/PlayerBase.tscn" id="1_eeneu"]
 [ext_resource type="Script" uid="uid://bevc4f6apql4t" path="res://scripts/Contents/Characters/HCN.gd" id="2_f7uj3"]
+[ext_resource type="PackedScene" uid="uid://wl8u5m52708w" path="res://components/Weapons/LGBT.tscn" id="3_2fpmn"]
 
 [node name="HCN" unique_id=1711205167 instance=ExtResource("1_eeneu")]
 script = ExtResource("2_f7uj3")
 displayName = "氰化氢"
+
+[node name="LGBT" parent="weaponStore" index="0" unique_id=1938660022 instance=ExtResource("3_2fpmn")]

components/Characters/Lynx.tscn

@@ -2,7 +2,10 @@
 
 [ext_resource type="PackedScene" uid="uid://bs863g2s8r770" path="res://components/Abstracts/PlayerBase.tscn" id="1_ns0m5"]
 [ext_resource type="Script" uid="uid://b8g0hkqvyeptg" path="res://scripts/Contents/Characters/Lynx.gd" id="2_d6nve"]
+[ext_resource type="PackedScene" uid="uid://frwt0fgrpskb" path="res://components/Weapons/Meowmere.tscn" id="3_nitbu"]
 
 [node name="Lynx" unique_id=1711205167 instance=ExtResource("1_ns0m5")]
 script = ExtResource("2_d6nve")
 displayName = "猞猁"
+
+[node name="Meowmere" parent="weaponStore" index="0" unique_id=1965287972 instance=ExtResource("3_nitbu")]

components/Characters/MuyangDog.tscn

@@ -2,7 +2,10 @@
 
 [ext_resource type="PackedScene" uid="uid://bs863g2s8r770" path="res://components/Abstracts/PlayerBase.tscn" id="1_y3l4w"]
 [ext_resource type="Script" uid="uid://bbmb572iba42l" path="res://scripts/Contents/Characters/MuyangDog.gd" id="2_mr6nm"]
+[ext_resource type="PackedScene" uid="uid://u0djqwuuysp8" path="res://components/Weapons/Volcano.tscn" id="3_e236u"]
 
 [node name="MuyangDog" unique_id=1711205167 instance=ExtResource("1_y3l4w")]
 script = ExtResource("2_mr6nm")
 displayName = "牧羊犬"
+
+[node name="Volcano" parent="weaponStore" index="0" unique_id=204992396 instance=ExtResource("3_e236u")]

components/Scenes/World.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=9 format=3 uid="uid://dmxi1ikn6avig"]
+[gd_scene format=3 uid="uid://dmxi1ikn6avig"]
 
 [ext_resource type="Script" uid="uid://d2oyyyg0b4qqd" path="res://scripts/Tools/Managers/WorldManager.gd" id="1_lxsxj"]
 [ext_resource type="PackedScene" uid="uid://dfwg750a47ggx" path="res://components/Scenes/UI.tscn" id="2_04cdd"]
@@ -66,57 +66,62 @@ _data = {
 [sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_lu72f"]
 normal = Vector2(0, 1)
 
-[node name="world" type="Node2D"]
+[node name="world" type="Node2D" unique_id=1992792389]
 y_sort_enabled = true
 texture_filter = 1
 script = ExtResource("1_lxsxj")
 metadata/_edit_vertical_guides_ = [-1.0, 57.0]
 
-[node name="spawner" type="MultiplayerSpawner" parent="."]
+[node name="spawner" type="MultiplayerSpawner" parent="." unique_id=1891214291]
 unique_name_in_owner = true
 spawn_path = NodePath("..")
 
-[node name="UI" parent="." instance=ExtResource("2_04cdd")]
+[node name="UI" parent="." unique_id=1312059514 instance=ExtResource("2_04cdd")]
 
-[node name="camera" type="Camera2D" parent="."]
+[node name="camera" type="Camera2D" parent="." unique_id=996511427]
 process_mode = 3
 process_callback = 0
+limit_left = -2400
+limit_top = -1800
+limit_right = 2400
+limit_bottom = 1800
 position_smoothing_enabled = true
+drag_horizontal_enabled = true
+drag_vertical_enabled = true
+editor_draw_limits = true
 script = ExtResource("5_mk7bv")
 constantOffset = Vector2(0, -80)
 
-[node name="animator" type="AnimationPlayer" parent="camera"]
+[node name="animator" type="AnimationPlayer" parent="camera" unique_id=619200978]
 unique_name_in_owner = true
-libraries = {
-&"": SubResource("AnimationLibrary_44ixa")
-}
+libraries/ = SubResource("AnimationLibrary_44ixa")
 
-[node name="map" type="StaticBody2D" parent="." groups=["map"]]
+[node name="map" type="StaticBody2D" parent="." unique_id=385091617 groups=["map"]]
 collision_layer = 6
 collision_mask = 6
 metadata/_edit_lock_ = true
 
-[node name="background" type="Sprite2D" parent="map"]
+[node name="background" type="Sprite2D" parent="map" unique_id=792319336]
 z_index = -100
 scale = Vector2(5, 5)
 texture = ExtResource("4_oy4jj")
 metadata/_edit_lock_ = true
 
-[node name="borderTop" type="CollisionShape2D" parent="map"]
+[node name="borderTop" type="CollisionShape2D" parent="map" unique_id=320842136]
 position = Vector2(0, -1800)
 shape = SubResource("WorldBoundaryShape2D_lu72f")
 
-[node name="borderTop2" type="CollisionShape2D" parent="map"]
+[node name="borderTop2" type="CollisionShape2D" parent="map" unique_id=1208131017]
 position = Vector2(0, 1800)
 rotation = 3.1415927
 shape = SubResource("WorldBoundaryShape2D_lu72f")
 
-[node name="borderTop3" type="CollisionShape2D" parent="map"]
+[node name="borderTop3" type="CollisionShape2D" parent="map" unique_id=585247179]
 position = Vector2(2400, 0)
 rotation = 1.5707964
 shape = SubResource("WorldBoundaryShape2D_lu72f")
 
-[node name="borderTop4" type="CollisionShape2D" parent="map"]
+[node name="borderTop4" type="CollisionShape2D" parent="map" unique_id=320391894]
 position = Vector2(-2400, 0)
 rotation = -1.5707964
 shape = SubResource("WorldBoundaryShape2D_lu72f")

export_presets.cfg

@@ -166,3 +166,229 @@ progressive_web_app/icon_512x512=""
 progressive_web_app/background_color=Color(0, 0, 0, 1)
 threads/emscripten_pool_size=8
 threads/godot_pool_size=4
+
+[preset.3]
+
+name="Android"
+platform="Android"
+runnable=true
+dedicated_server=false
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path="build/android/DLH.apk"
+patches=PackedStringArray()
+patch_delta_encoding=false
+patch_delta_compression_level_zstd=19
+patch_delta_min_reduction=0.1
+patch_delta_include_filters="*"
+patch_delta_exclude_filters=""
+encryption_include_filters=""
+encryption_exclude_filters=""
+seed=0
+encrypt_pck=false
+encrypt_directory=false
+script_export_mode=2
+
+[preset.3.options]
+
+custom_template/debug=""
+custom_template/release=""
+gradle_build/use_gradle_build=false
+gradle_build/gradle_build_directory=""
+gradle_build/android_source_template=""
+gradle_build/compress_native_libraries=false
+gradle_build/export_format=0
+gradle_build/min_sdk=""
+gradle_build/target_sdk=""
+gradle_build/custom_theme_attributes={}
+architectures/armeabi-v7a=false
+architectures/arm64-v8a=true
+architectures/x86=false
+architectures/x86_64=false
+version/code=1
+version/name=""
+package/unique_name="top.fshrimp.doglynxhcn"
+package/name="犬，猞猁，与氰化氢"
+package/signed=true
+package/app_category=2
+package/retain_data_on_uninstall=false
+package/exclude_from_recents=false
+package/show_in_android_tv=false
+package/show_in_app_library=true
+package/show_as_launcher_app=false
+launcher_icons/main_192x192=""
+launcher_icons/adaptive_foreground_432x432=""
+launcher_icons/adaptive_background_432x432=""
+launcher_icons/adaptive_monochrome_432x432=""
+graphics/opengl_debug=false
+shader_baker/enabled=false
+xr_features/xr_mode=0
+gesture/swipe_to_dismiss=false
+screen/immersive_mode=true
+screen/edge_to_edge=true
+screen/support_small=true
+screen/support_normal=true
+screen/support_large=true
+screen/support_xlarge=true
+screen/background_color=Color(0, 0, 0, 1)
+user_data_backup/allow=true
+command_line/extra_args=""
+apk_expansion/enable=false
+apk_expansion/SALT=""
+apk_expansion/public_key=""
+permissions/custom_permissions=PackedStringArray()
+permissions/access_checkin_properties=false
+permissions/access_coarse_location=false
+permissions/access_fine_location=false
+permissions/access_location_extra_commands=false
+permissions/access_media_location=false
+permissions/access_mock_location=false
+permissions/access_network_state=false
+permissions/access_surface_flinger=false
+permissions/access_wifi_state=false
+permissions/account_manager=false
+permissions/add_voicemail=false
+permissions/authenticate_accounts=false
+permissions/battery_stats=false
+permissions/bind_accessibility_service=false
+permissions/bind_appwidget=false
+permissions/bind_device_admin=false
+permissions/bind_input_method=false
+permissions/bind_nfc_service=false
+permissions/bind_notification_listener_service=false
+permissions/bind_print_service=false
+permissions/bind_remoteviews=false
+permissions/bind_text_service=false
+permissions/bind_vpn_service=false
+permissions/bind_wallpaper=false
+permissions/bluetooth=false
+permissions/bluetooth_admin=false
+permissions/bluetooth_privileged=false
+permissions/brick=false
+permissions/broadcast_package_removed=false
+permissions/broadcast_sms=false
+permissions/broadcast_sticky=false
+permissions/broadcast_wap_push=false
+permissions/call_phone=false
+permissions/call_privileged=false
+permissions/camera=false
+permissions/capture_audio_output=false
+permissions/capture_secure_video_output=false
+permissions/capture_video_output=false
+permissions/change_component_enabled_state=false
+permissions/change_configuration=false
+permissions/change_network_state=false
+permissions/change_wifi_multicast_state=false
+permissions/change_wifi_state=false
+permissions/clear_app_cache=false
+permissions/clear_app_user_data=false
+permissions/control_location_updates=false
+permissions/delete_cache_files=false
+permissions/delete_packages=false
+permissions/device_power=false
+permissions/diagnostic=false
+permissions/disable_keyguard=false
+permissions/dump=false
+permissions/expand_status_bar=false
+permissions/factory_test=false
+permissions/flashlight=false
+permissions/force_back=false
+permissions/get_accounts=false
+permissions/get_package_size=false
+permissions/get_tasks=false
+permissions/get_top_activity_info=false
+permissions/global_search=false
+permissions/hardware_test=false
+permissions/inject_events=false
+permissions/install_location_provider=false
+permissions/install_packages=false
+permissions/install_shortcut=false
+permissions/internal_system_window=false
+permissions/internet=false
+permissions/kill_background_processes=false
+permissions/location_hardware=false
+permissions/manage_accounts=false
+permissions/manage_app_tokens=false
+permissions/manage_documents=false
+permissions/manage_external_storage=false
+permissions/manage_media=false
+permissions/master_clear=false
+permissions/media_content_control=false
+permissions/modify_audio_settings=false
+permissions/modify_phone_state=false
+permissions/mount_format_filesystems=false
+permissions/mount_unmount_filesystems=false
+permissions/nfc=false
+permissions/persistent_activity=false
+permissions/post_notifications=false
+permissions/process_outgoing_calls=false
+permissions/read_calendar=false
+permissions/read_call_log=false
+permissions/read_contacts=false
+permissions/read_external_storage=false
+permissions/read_frame_buffer=false
+permissions/read_history_bookmarks=false
+permissions/read_input_state=false
+permissions/read_logs=false
+permissions/read_media_audio=false
+permissions/read_media_images=false
+permissions/read_media_video=false
+permissions/read_media_visual_user_selected=false
+permissions/read_phone_state=false
+permissions/read_profile=false
+permissions/read_sms=false
+permissions/read_social_stream=false
+permissions/read_sync_settings=false
+permissions/read_sync_stats=false
+permissions/read_user_dictionary=false
+permissions/reboot=false
+permissions/receive_boot_completed=false
+permissions/receive_mms=false
+permissions/receive_sms=false
+permissions/receive_wap_push=false
+permissions/record_audio=false
+permissions/reorder_tasks=false
+permissions/restart_packages=false
+permissions/send_respond_via_message=false
+permissions/send_sms=false
+permissions/set_activity_watcher=false
+permissions/set_alarm=false
+permissions/set_always_finish=false
+permissions/set_animation_scale=false
+permissions/set_debug_app=false
+permissions/set_orientation=false
+permissions/set_pointer_speed=false
+permissions/set_preferred_applications=false
+permissions/set_process_limit=false
+permissions/set_time=false
+permissions/set_time_zone=false
+permissions/set_wallpaper=false
+permissions/set_wallpaper_hints=false
+permissions/signal_persistent_processes=false
+permissions/status_bar=false
+permissions/subscribed_feeds_read=false
+permissions/subscribed_feeds_write=false
+permissions/system_alert_window=false
+permissions/transmit_ir=false
+permissions/uninstall_shortcut=false
+permissions/update_device_stats=false
+permissions/use_credentials=false
+permissions/use_sip=false
+permissions/vibrate=false
+permissions/wake_lock=false
+permissions/write_apn_settings=false
+permissions/write_calendar=false
+permissions/write_call_log=false
+permissions/write_contacts=false
+permissions/write_external_storage=false
+permissions/write_gservices=false
+permissions/write_history_bookmarks=false
+permissions/write_profile=false
+permissions/write_secure_settings=false
+permissions/write_settings=false
+permissions/write_sms=false
+permissions/write_social_stream=false
+permissions/write_sync_settings=false
+permissions/write_user_dictionary=false

project.godot

@@ -135,3 +135,4 @@ locale/locale_filter_mode=0
 
 renderer/rendering_method="gl_compatibility"
 renderer/rendering_method.mobile="gl_compatibility"
+textures/vram_compression/import_etc2_astc=true

resources/characters/kernyr/kernyr.jpg.import

@@ -4,15 +4,16 @@ importer="texture"
 type="CompressedTexture2D"
 uid="uid://b1aq0k7tf1p1"
 path.s3tc="res://.godot/imported/kernyr.jpg-d82cf548a25a07dbd282dd92971a45c3.s3tc.ctex"
+path.etc2="res://.godot/imported/kernyr.jpg-d82cf548a25a07dbd282dd92971a45c3.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://resources/characters/kernyr/kernyr.jpg"
-dest_files=["res://.godot/imported/kernyr.jpg-d82cf548a25a07dbd282dd92971a45c3.s3tc.ctex"]
+dest_files=["res://.godot/imported/kernyr.jpg-d82cf548a25a07dbd282dd92971a45c3.s3tc.ctex", "res://.godot/imported/kernyr.jpg-d82cf548a25a07dbd282dd92971a45c3.etc2.ctex"]
 
 [params]
 

scripts/Contents/Panels/Starter.gd

@@ -89,7 +89,10 @@ func startSingleplayerGame():
 	), OutGameStorage.upgradableFieldsValue)
 	UIState.player = EntityBase.generatePlayer(playerNameInput.text, selectedCharacter, extras)
 	WorldManager.rootNode.spawnWave(Vector2.ZERO)
-	UIState.setPanel("CompilingTip")
+	if buildingShader:
+		UIState.setPanel("CompilingTip")
+	else:
+		UIState.setPanel("SelectInitialFeed")
 
 func _ready():
 	historyStack = Composables.useHistoryStack(playerNameInput)

scripts/Statemachine/EntityBase.gd

@@ -136,10 +136,6 @@ func _ready():
 	if isPlayer():
 		if displayName == MultiplayerState.playerName:
 			UIState.player = self
-		if WorldManager.isRelease():
-			for i in weaponStore.get_children():
-				i.queue_free()
-			weaponStore.add_child(ComponentManager.getWeapon("PurpleCrystal").instantiate())
 		for i in weaponStore.get_children():
 			i.hide()
 			weapons.append(i)
@@ -448,7 +444,7 @@ func tryDie(by: BulletBase = null):
 		UIState.showTip("[b]%s[/b] 已被打败！" % displayName, TipBox.MessageType.CONGRATULATION)
 	elif isPlayer():
 		UIState.showTip("[b]%s[/b] 似了😭。" % displayName, TipBox.MessageType.ERROR)
-	if !isPlayer():
+	if !isPlayer() || isSummon():
 		queue_free()
 func tryHeal(count: float):
 	playSound("heal")
@@ -564,7 +560,6 @@ static func findPlayer(playerName: String) -> EntityBase:
 static func generatePlayer(playerName: String, character: String, extraFields: Dictionary = {}) -> EntityBase:
 	var player = generate(ComponentManager.getCharacter(character), Vector2.ZERO, false, false, true, playerName)
 	player.name = "Player_%s" % playerName
-	print(extraFields)
 	var feed = ComponentManager.getAbstract("FeedCardBase").instantiate() as Feed
 	for field in extraFields:
 		feed.fields.append(field)

scripts/Statemachine/UIState.gd

@@ -48,19 +48,10 @@ func _physics_process(_delta):
 		if !fieldsAnimator.is_playing():
 			if showingFields:
 				if Input.is_action_just_released("showFields") || !(currentPanel is PausePanel):
-					showingFields = false
-					fieldsAnimator.play("hide")
+					hideFields()
 			else:
 				if Input.is_action_just_pressed("showFields") || currentPanel is PausePanel:
-					showingFields = true
-					for i in fields.get_children():
-						fields.remove_child(i)
-					for i in player.fields:
-						if player.fields[i] == EntityBase.TITLE_FLAG:
-							fields.add_child(QuickUI.graySmallText(i))
-						else:
-							fields.add_child(FieldShow.create(i, player.fields[i], false, player, true))
-					fieldsAnimator.play("show")
+					showFields()
 			
 		if Input.is_action_just_pressed("pause"):
 			if currentPanel:
@@ -100,6 +91,7 @@ static func setPanel(targetName: String = "", args: Array = []):
 				panel.hidePanel()
 static func closeCurrentPanel():
 	setPanel()
+
 static func showTip(text: String, messageType: TipBox.MessageType = TipBox.MessageType.INFO):
 	var box = TipBox.create(text, messageType)
 	tips.add_child(box)
@@ -110,3 +102,17 @@ static func clearTips():
 	for child in tips.get_children():
 		if child is TipBox:
 			child.destroy()
+
+static func showFields():
+	showingFields = true
+	for i in fields.get_children():
+		fields.remove_child(i)
+	for i in player.fields:
+		if player.fields[i] == EntityBase.TITLE_FLAG:
+			fields.add_child(QuickUI.graySmallText(i))
+		else:
+			fields.add_child(FieldShow.create(i, player.fields[i], false, player, true))
+	fieldsAnimator.play("show")
+static func hideFields():
+	showingFields = false
+	fieldsAnimator.play("hide")

scripts/Tools/Managers/CameraManager.gd

@@ -17,7 +17,7 @@ func _physics_process(_delta):
 	if is_instance_valid(UIState.player):
 		position = UIState.player.position + constantOffset
 		position += MathTool.sampleInCircle(shakeIntensity)
-		offset += ((get_global_mouse_position() - UIState.player.position).clampf(-100, 100) - offset) * 0.15
+		position += MouseTool.getPositionByScreen(Vector2.ONE * 0.5, self ) / 2
 
 static func shake(millseconds: float, intensity: float = 10, steper: Callable = func(currentValue, _totalValue, _restPercent): return currentValue):
 	if StarterPanel.buildingShader: return

scripts/Tools/Managers/GameBusManager.gd

@@ -10,8 +10,10 @@ static func restart(tree: SceneTree):
 	for item in tree.get_nodes_in_group("items"):
 		item.queue_free()
 
+	UIState.hideFields()
 	OutGameStorage.saveInventory()
 	CameraManager.shakeStop()
 	WorldManager.timeRestart()
+	StarterPanel.selectingFeed = true
 
 	UIState.setPanel("Starter")

scripts/Tools/MouseTool.gd

@@ -0,0 +1,5 @@
+class_name MouseTool
+
+static func getPositionByScreen(anchor: Vector2, by: Node):
+	var viewport = by.get_viewport()
+	return viewport.get_mouse_position() - viewport.get_visible_rect().size * anchor

scripts/Tools/MouseTool.gd.uid

@@ -0,0 +1 @@
+uid://yf2h5ni3gobm