Skip to content

Commit a70302b

Browse files
author
Shengjie Xu
committed
[Core][Asset] Add first character sprite set
1 parent 42bedf2 commit a70302b

26 files changed

+75
-4
lines changed
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
选区:
2+
M1-头发:
3+
基础颜色: "#886F64"
4+
适用于: L4-头发
5+
M2-衣服:
6+
基础颜色: "#8C6E5F"
7+
适用于: L3-衣服
8+
M3-裙子:
9+
基础颜色: "#FCFAF9"
10+
适用于: L2-裙子
11+
生成:
12+
charactersprite_parts_based:
13+
部件类型:
14+
B1: preset_kind_base
15+
B2: preset_kind_base
16+
M: preset_kind_eyebrow
17+
#Y: preset_kind_eye
18+
K: preset_kind_mouth
19+
#Q: preset_kind_fullface
20+
DA: preset_kind_decoration
21+
DB: preset_kind_decoration
22+
标签:
23+
通用: preset_tag_general
24+
笑容: preset_tag_smile
25+
愤怒: preset_tag_angry
26+
悲伤: preset_tag_sad
27+
惊讶: preset_tag_surprised
28+
困惑: preset_tag_confused
29+
害怕: preset_tag_scared
30+
基底: preset_tag_base
31+
部件:
32+
B1:
33+
L1-底图: 基底
34+
L2-裙子: 基底
35+
L3-衣服: 基底
36+
M:
37+
M0-正常: ["通用", "笑容", "惊讶", "困惑", "害怕"]
38+
M1-悲伤: 悲伤
39+
M2-生气: 愤怒
40+
K:
41+
K0-正常: ["通用","害怕","愤怒","惊讶","困惑","笑容"]
42+
K1-圆张嘴: ["通用","害怕","困惑","笑容"]
43+
K2-闭嘴: ["通用","害怕","愤怒","困惑","笑容"]
44+
K3-纠结: 害怕
45+
K4-欢呼: 笑容
46+
K5-撇嘴: 愤怒
47+
K6-尴尬嘴: 害怕
48+
K7-张嘴扁: 笑容
49+
K8-悲伤嘴: 悲伤
50+
K9-嘟嘴: ["通用","愤怒"]
51+
B2:
52+
L4-头发: 基底
53+
L5-上层: 基底
54+
DA:
55+
D1-眼泪: {标签: ["害怕","悲伤"], 互斥: ["K0"], 依赖: ["K8"]}
56+
D2-流汗: ["通用","害怕","笑容"]
57+
DB:
58+
D3-眼镜框: ["通用","害怕","愤怒","悲伤","惊讶","困惑","笑容"]
59+
基底简写:
60+
B0: L1L2L3L4L5
61+
元数据:
62+
author: "秋襟"
63+
overview_scale: 0.2
64+
diff_croprect: [1885, 905, 2685, 1705]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
kind: CHARACTER
2+
reference:
3+
en: "DT1"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
imagepack:
2+
A0DT1:
3+
yamlpath: "{srcpath}/A0-秋襟/DT1-短发女生/config.yml"

assets/preppipe_asset_manifest.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
subdirs:
2+
- imagepack/charactersprite/charactersprites.yml
23
- imagepack/background/backgrounds.yml
34
- thirdparty/thirdparty.yml
45
- gui/gui.yml

src/preppipe/util/imagepack.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class ImagePack(NamedAssetClassBase):
101101

102102
class MaskInfo:
103103
mask : ImageWrapper | None # 如果为 None 则表示该 mask 覆盖所有适用的基底图层
104-
basename : str # 保存时使用的名称(不含后缀)
104+
basename : str | None # 保存时使用的名称(不含后缀)
105105
offset_x : int
106106
offset_y : int
107107
width : int
@@ -117,7 +117,7 @@ def __init__(self, mask : ImageWrapper | None, mask_color : Color,
117117
offset_x : int = 0, offset_y : int = 0,
118118
width : int = 0, height : int = 0,
119119
projective_vertices : tuple[tuple[int,int],tuple[int,int],tuple[int,int],tuple[int,int]] | None = None,
120-
basename : str = '', applyon : typing.Iterable[int] | None = None) -> None:
120+
basename : str | None = None, applyon : typing.Iterable[int] | None = None) -> None:
121121
self.mask = mask
122122
self.mask_color = mask_color
123123
self.offset_x = offset_x
@@ -266,7 +266,7 @@ def check_filename(filename : str):
266266
json_masks = []
267267
for m in self.masks:
268268
basename = m.basename
269-
if basename != "None":
269+
if basename is not None:
270270
if len(basename) == 0:
271271
basename = 'm' + str(len(json_masks))
272272
filename = basename + ".png"
@@ -917,7 +917,7 @@ def check_base_cover(l : ImagePack.LayerInfo) -> bool:
917917
break
918918
if isFullyCovers:
919919
m.mask = None
920-
m.basename = "None"
920+
m.basename = None
921921

922922
def get_summary_no_variations(self, descriptor : 'ImagePackDescriptor') -> 'ImagePackSummary':
923923
# 在该图片组没有使用基底图变体时生成 ImagePackSummary

0 commit comments

Comments
 (0)