xlljc/DungeonShooting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gitee/develop' into develop

Browse Source 
# Conflicts:
#	DungeonShooting_Godot/resource/sprite/role/enemy0002/enemy0001.png.import
#	DungeonShooting_Godot/resource/sprite/role/enemy0006/enemy0005_Icon.png.import
#	DungeonShooting_Godot/resource/sprite/role/enemy0006/enemy0006_Debris.png.import
#	DungeonShooting_Godot/resource/sprite/role/enemy0007/dle.png.import
#	DungeonShooting_Godot/resource/sprite/role/enemy0007/enemy0005_Icon.png.import
#	DungeonShooting_Godot/resource/sprite/role/enemy0007/enemy0006_Debris.png.import
#	DungeonShooting_Godot/resource/sprite/role/role0002/eat/eat.png.import
#	DungeonShooting_Godot/resource/sprite/role/role0002/idle/idle.png.import
#	DungeonShooting_Godot/resource/sprite/role/role0002/run/Sprite.png.import
This commit is contained in:
小李xl 2024-04-11 01:50:13 +08:00
commit 402dfd92ce
10 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
DungeonShooting_Godot/resource/sprite/bullet/normal/bullet0005.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 135 B

After

Width:  |  Height:  |  Size: 417 B

2
DungeonShooting_Godot/resource/sprite/role/enemy0002/enemy0001.png.import
View File

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://d3mgv0utmax42"
uid="uid://bj7431s6081pt"
path="res://.godot/imported/enemy0001.png-bd4a7798d07cd5f254c33ccbfead77f4.ctex"
metadata={
"vram_texture": false

2
DungeonShooting_Godot/resource/sprite/role/enemy0006/enemy0005_Icon.png.import
View File

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://cxwjdbql5m2v0"
uid="uid://bwtmntgepkiee"
path="res://.godot/imported/enemy0005_Icon.png-2897ecc50529bab5d0643e849e41cf6f.ctex"
metadata={
"vram_texture": false

2
DungeonShooting_Godot/resource/sprite/role/enemy0006/enemy0006_Debris.png.import
View File

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://cm43ngrboceyr"
uid="uid://dj03mufxwgfek"
path="res://.godot/imported/enemy0006_Debris.png-d1fbf79bad5aefa7d37040e3a6e8db7d.ctex"
metadata={
"vram_texture": false

2
DungeonShooting_Godot/resource/sprite/role/enemy0007/dle.png.import
View File

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://cwpffv2oan6cy"
uid="uid://duyr3ic6hh3ek"
path="res://.godot/imported/dle.png-79145da0f375bf73578bd141d00d2ce8.ctex"
metadata={
"vram_texture": false

2
DungeonShooting_Godot/resource/sprite/role/enemy0007/enemy0005_Icon.png.import
View File

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://b7hkqotixfp6c"
uid="uid://cpd6jhjfg7cyk"
path="res://.godot/imported/enemy0005_Icon.png-0a336b66135db16c8e2f50cd4c955d4e.ctex"
metadata={
"vram_texture": false

2
DungeonShooting_Godot/resource/sprite/role/enemy0007/enemy0006_Debris.png.import
View File

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://l8k0hb6v4os3"
uid="uid://d0nfvywb17dup"
path="res://.godot/imported/enemy0006_Debris.png-8d79cda8586b6b07126be2733324473d.ctex"
metadata={
"vram_texture": false

2
DungeonShooting_Godot/resource/sprite/role/role0002/eat/eat.png.import
View File

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://dkqlpt32fo6or"
uid="uid://dwhk45k0s73mr"
path="res://.godot/imported/eat.png-e1ed219f030d4904026f5a118b10ffbc.ctex"
metadata={
"vram_texture": false

2
DungeonShooting_Godot/resource/sprite/role/role0002/idle/idle.png.import
View File

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://c6q6mg6qf516t"
uid="uid://mrqq4rg53res"
path="res://.godot/imported/idle.png-9ab7c522bba3fc742b6cace13ceaedde.ctex"
metadata={
"vram_texture": false

2
DungeonShooting_Godot/resource/sprite/role/role0002/run/Sprite.png.import
View File

@ -2,7 +2,7 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://00fayflq13rs"
uid="uid://cwitqb7klfj3n"
path="res://.godot/imported/Sprite.png-bf7f6826c7373e1221a0a5e7a76364b1.ctex"
metadata={
"vram_texture": false