Merge pull request #35 from ligen131/mouse

向Credits中加入头像

README.md

@@ -6,10 +6,10 @@
 
 A game made by Team 玩一个四字音游导致的 during [Global Game Jam](https://globalgamejam.org/) 2024. Participated [onsite](https://www.huodongxing.com/event/2732777803400?td=6303464850639) at [ChillyRoom](https://www.chillyroom.com/), Shenzhen, China.
 
-- Coding: [@cutekibry](https://github.com/cutekibry), [@ligen131](https://github.com/ligen131), [@Bunnycxk](https://github.com/Bunnycxk)
+- Code: [@cutekibry](https://github.com/cutekibry), [@ligen131](https://github.com/ligen131), [@Bunnycxk](https://github.com/Bunnycxk)
 - Art: [@IsaacTheMouse](https://github.com/IsaacTheMouse), [@Bunnycxk](https://github.com/Bunnycxk)
 - Music: [@cutekibry](https://github.com/cutekibry)
-- Planning: everyone
+- Design: everyone
 
 ## Introduction
 

objects/credits/bunny.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://c585nvnsd4utt"
+path="res://.godot/imported/bunny.png-f17081fcd39d3c41b363cd0360ac3c4e.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://objects/credits/bunny.png"
+dest_files=["res://.godot/imported/bunny.png-f17081fcd39d3c41b363cd0360ac3c4e.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

objects/credits/credits.tscn

@@ -1,7 +1,11 @@
-[gd_scene load_steps=3 format=3 uid="uid://cdu8yubd7fyvb"]
+[gd_scene load_steps=7 format=3 uid="uid://cdu8yubd7fyvb"]
 
 [ext_resource type="FontFile" uid="uid://1000owdyvwfg" path="res://fonts/unifont-15.1.04.otf" id="1_re7ax"]
 [ext_resource type="Script" path="res://objects/credits/credits.gd" id="2_epjvn"]
+[ext_resource type="Texture2D" uid="uid://c585nvnsd4utt" path="res://objects/credits/bunny.png" id="3_4jp5o"]
+[ext_resource type="Texture2D" uid="uid://dtf6v2q2p4mku" path="res://objects/credits/ligen.png" id="4_m7war"]
+[ext_resource type="Texture2D" uid="uid://chh0duwbissj5" path="res://objects/credits/tsuki.png" id="5_uqmmc"]
+[ext_resource type="Texture2D" uid="uid://c0pt1v7cx7631" path="res://objects/credits/mouse.png" id="6_316uh"]
 
 [node name="Label" type="Label"]
 custom_minimum_size = Vector2(480, 256)
@@ -14,11 +18,28 @@ text = "
  
 Created by 玩一个四字音游导致的 @ GGJ2024
  
-ligen131         Tsukimaru
+Bunnycxk         Tsukimaru
  
-  Bunnycxk       IsaacTheMouse
+  ligen131       IsaacTheMouse
  
  
 THANKS FOR PLAYING! ;-)"
 horizontal_alignment = 1
 script = ExtResource("2_epjvn")
+metadata/_edit_vertical_guides_ = [112.0]
+
+[node name="Bunny" type="Sprite2D" parent="."]
+position = Vector2(90, 122)
+texture = ExtResource("3_4jp5o")
+
+[node name="Ligen" type="Sprite2D" parent="."]
+position = Vector2(90, 165)
+texture = ExtResource("4_m7war")
+
+[node name="Tsuki" type="Sprite2D" parent="."]
+position = Vector2(390, 120)
+texture = ExtResource("5_uqmmc")
+
+[node name="Mouse" type="Sprite2D" parent="."]
+position = Vector2(390, 167)
+texture = ExtResource("6_316uh")

objects/credits/ligen.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dtf6v2q2p4mku"
+path="res://.godot/imported/ligen.png-fec13055aaa464f5ab7ae0a9c8debd20.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://objects/credits/ligen.png"
+dest_files=["res://.godot/imported/ligen.png-fec13055aaa464f5ab7ae0a9c8debd20.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

objects/credits/mouse.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://c0pt1v7cx7631"
+path="res://.godot/imported/mouse.png-2f127b435ac041c677f871a73fe64754.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://objects/credits/mouse.png"
+dest_files=["res://.godot/imported/mouse.png-2f127b435ac041c677f871a73fe64754.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

objects/credits/tsuki.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://chh0duwbissj5"
+path="res://.godot/imported/tsuki.png-1cce4def5607aa81bc72753120a0a6c6.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://objects/credits/tsuki.png"
+dest_files=["res://.godot/imported/tsuki.png-1cce4def5607aa81bc72753120a0a6c6.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

objects/word/word.gd

@@ -71,7 +71,7 @@ func load_image(h: int, is_victory: bool):
 			for y in range(new_texture.get_height()):
 				var color = new_texture.get_pixel(x, y)
 				if color == Color(0, 0, 0, 1):  # 如果像素是黑色
-					new_texture.set_pixel(x, y, Color(0xf5 / 256.0, 0xdf / 256.0, 0x4d / 256.0, 1))  # 将其改为金黄色
+					new_texture.set_pixel(x, y, Color.hex(0xf5df4dff))  # 将其改为金黄色
 		return ImageTexture.create_from_image(new_texture)
 
 	return image