Skip to content

Commit 6de9af9

Browse files
runheyrunhey
authored
Merge pull request #768 from ljxun/heydev
refactor(Component/Costume):优化皮肤和战斗主题模型的代码结构
2 parents a0b3146 + 8859488 commit 6de9af9

File tree

1 file changed

+24
-111
lines changed

1 file changed

+24
-111
lines changed

‎tasks/Component/Costume/costume_base.py‎

Lines changed: 24 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -12,64 +12,18 @@
1212
from tasks.Component.CostumeBattle.assets import CostumeBattleAssets
1313

1414
# 庭院皮肤
15+
# 主界面皮肤（使用字典推导式动态生成）
1516
main_costume_model = {
16-
MainType.COSTUME_MAIN_1: {'I_CHECK_MAIN': 'I_CHECK_MAIN_1',
17-
'I_MAIN_GOTO_EXPLORATION': 'I_MAIN_GOTO_EXPLORATION_1',
18-
'I_MAIN_GOTO_SUMMON': 'I_MAIN_GOTO_SUMMON_1',
19-
'I_MAIN_GOTO_TOWN': 'I_MAIN_GOTO_TOWN_1',
20-
'I_PET_HOUSE': 'I_PET_HOUSE_1', },
21-
MainType.COSTUME_MAIN_2: {'I_CHECK_MAIN': 'I_CHECK_MAIN_2',
22-
'I_MAIN_GOTO_EXPLORATION': 'I_MAIN_GOTO_EXPLORATION_2',
23-
'I_MAIN_GOTO_SUMMON': 'I_MAIN_GOTO_SUMMON_2',
24-
'I_MAIN_GOTO_TOWN': 'I_MAIN_GOTO_TOWN_2',
25-
'I_PET_HOUSE': 'I_PET_HOUSE_2', },
26-
MainType.COSTUME_MAIN_3: {'I_CHECK_MAIN': 'I_CHECK_MAIN_3',
27-
'I_MAIN_GOTO_EXPLORATION': 'I_MAIN_GOTO_EXPLORATION_3',
28-
'I_MAIN_GOTO_SUMMON': 'I_MAIN_GOTO_SUMMON_3',
29-
'I_MAIN_GOTO_TOWN': 'I_MAIN_GOTO_TOWN_3',
30-
'I_PET_HOUSE': 'I_PET_HOUSE_3', },
31-
MainType.COSTUME_MAIN_4: {'I_CHECK_MAIN': 'I_CHECK_MAIN_4',
32-
'I_MAIN_GOTO_EXPLORATION': 'I_MAIN_GOTO_EXPLORATION_4',
33-
'I_MAIN_GOTO_SUMMON': 'I_MAIN_GOTO_SUMMON_4',
34-
'I_MAIN_GOTO_TOWN': 'I_MAIN_GOTO_TOWN_4',
35-
'I_PET_HOUSE': 'I_PET_HOUSE_4', },
36-
MainType.COSTUME_MAIN_5: {'I_CHECK_MAIN': 'I_CHECK_MAIN_5',
37-
'I_MAIN_GOTO_EXPLORATION': 'I_MAIN_GOTO_EXPLORATION_5',
38-
'I_MAIN_GOTO_SUMMON': 'I_MAIN_GOTO_SUMMON_5',
39-
'I_MAIN_GOTO_TOWN': 'I_MAIN_GOTO_TOWN_5',
40-
'I_PET_HOUSE': 'I_PET_HOUSE_5', },
41-
MainType.COSTUME_MAIN_6: {'I_CHECK_MAIN': 'I_CHECK_MAIN_6',
42-
'I_MAIN_GOTO_EXPLORATION': 'I_MAIN_GOTO_EXPLORATION_6',
43-
'I_MAIN_GOTO_SUMMON': 'I_MAIN_GOTO_SUMMON_6',
44-
'I_MAIN_GOTO_TOWN': 'I_MAIN_GOTO_TOWN_6',
45-
'I_PET_HOUSE': 'I_PET_HOUSE_6', },
46-
MainType.COSTUME_MAIN_7: {'I_CHECK_MAIN': 'I_CHECK_MAIN_7',
47-
'I_MAIN_GOTO_EXPLORATION': 'I_MAIN_GOTO_EXPLORATION_7',
48-
'I_MAIN_GOTO_SUMMON': 'I_MAIN_GOTO_SUMMON_7',
49-
'I_MAIN_GOTO_TOWN': 'I_MAIN_GOTO_TOWN_7',
50-
'I_PET_HOUSE': 'I_PET_HOUSE_7', },
51-
MainType.COSTUME_MAIN_8: {'I_CHECK_MAIN': 'I_CHECK_MAIN_8',
52-
'I_MAIN_GOTO_EXPLORATION': 'I_MAIN_GOTO_EXPLORATION_8',
53-
'I_MAIN_GOTO_SUMMON': 'I_MAIN_GOTO_SUMMON_8',
54-
'I_MAIN_GOTO_TOWN': 'I_MAIN_GOTO_TOWN_8',
55-
'I_PET_HOUSE': 'I_PET_HOUSE_8', },
56-
MainType.COSTUME_MAIN_9: {'I_CHECK_MAIN': 'I_CHECK_MAIN_9',
57-
'I_MAIN_GOTO_EXPLORATION': 'I_MAIN_GOTO_EXPLORATION_9',
58-
'I_MAIN_GOTO_SUMMON': 'I_MAIN_GOTO_SUMMON_9',
59-
'I_MAIN_GOTO_TOWN': 'I_MAIN_GOTO_TOWN_9',
60-
'I_PET_HOUSE': 'I_PET_HOUSE_9', },
61-
MainType.COSTUME_MAIN_10: {'I_CHECK_MAIN': 'I_CHECK_MAIN_10',
62-
'I_MAIN_GOTO_EXPLORATION': 'I_MAIN_GOTO_EXPLORATION_10',
63-
'I_MAIN_GOTO_SUMMON': 'I_MAIN_GOTO_SUMMON_10',
64-
'I_MAIN_GOTO_TOWN': 'I_MAIN_GOTO_TOWN_10',
65-
'I_PET_HOUSE': 'I_PET_HOUSE_10', },
66-
MainType.COSTUME_MAIN_11: {'I_CHECK_MAIN': 'I_CHECK_MAIN_11',
67-
'I_MAIN_GOTO_EXPLORATION': 'I_MAIN_GOTO_EXPLORATION_11',
68-
'I_MAIN_GOTO_SUMMON': 'I_MAIN_GOTO_SUMMON_11',
69-
'I_MAIN_GOTO_TOWN': 'I_MAIN_GOTO_TOWN_11',
70-
'I_PET_HOUSE': 'I_PET_HOUSE_11', },
17+
getattr(MainType, f"COSTUME_MAIN_{i}"): {
18+
'I_CHECK_MAIN': f'I_CHECK_MAIN_{i}',
19+
'I_MAIN_GOTO_EXPLORATION': f'I_MAIN_GOTO_EXPLORATION_{i}',
20+
'I_MAIN_GOTO_SUMMON': f'I_MAIN_GOTO_SUMMON_{i}',
21+
'I_MAIN_GOTO_TOWN': f'I_MAIN_GOTO_TOWN_{i}',
22+
'I_PET_HOUSE': f'I_PET_HOUSE_{i}'
23+
} for i in range(1, 12)
7124
}
7225

26+
7327
# 结界皮肤
7428
realm_costume_model = {
7529
RealmType.COSTUME_REALM_1: {'I_SHI_CARD': 'I_SHI_CARD_1',
@@ -81,62 +35,21 @@
8135
'I_BOX_EXP': 'I_BOX_EXP_2'},
8236
}
8337

84-
# 战斗主题
85-
battle_theme_model = {
86-
BattleType.COSTUME_BATTLE_1: {
87-
'I_LOCAL': 'I_LOCAL_1',
88-
'I_EXIT': 'I_EXIT_1',
89-
'I_FRIENDS': 'I_FRIENDS_1',
90-
},
91-
BattleType.COSTUME_BATTLE_2: {
92-
'I_LOCAL': 'I_LOCAL_2',
93-
'I_EXIT': 'I_EXIT_2',
94-
'I_FRIENDS': 'I_FRIENDS_2',
95-
},
96-
BattleType.COSTUME_BATTLE_3: {
97-
'I_LOCAL': 'I_LOCAL_3',
98-
'I_EXIT': 'I_EXIT_3',
99-
'I_FRIENDS': 'I_FRIENDS_3',
100-
},
101-
BattleType.COSTUME_BATTLE_4: {
102-
'I_LOCAL': 'I_LOCAL_4',
103-
'I_EXIT': 'I_EXIT_4',
104-
'I_FRIENDS': 'I_FRIENDS_4',
105-
},
106-
BattleType.COSTUME_BATTLE_5: {
107-
'I_LOCAL': 'I_LOCAL_5',
108-
'I_EXIT': 'I_EXIT_5',
109-
'I_FRIENDS': 'I_FRIENDS_5',
110-
},
111-
BattleType.COSTUME_BATTLE_6: {
112-
'I_LOCAL': 'I_LOCAL_6',
113-
'I_EXIT': 'I_EXIT_6',
114-
'I_FRIENDS': 'I_FRIENDS_6',
115-
},
116-
BattleType.COSTUME_BATTLE_7: {
117-
'I_LOCAL': 'I_LOCAL_7',
118-
'I_EXIT': 'I_EXIT_7',
119-
'I_FRIENDS': 'I_FRIENDS_7',
120-
},
121-
BattleType.COSTUME_BATTLE_8: {
122-
'I_LOCAL': 'I_LOCAL_8',
123-
'I_EXIT': 'I_EXIT_8',
124-
'I_FRIENDS': 'I_FRIENDS_8',
125-
'I_WIN': 'I_WIN_8',
126-
'I_DE_WIN': 'I_DE_WIN_8',
127-
'I_FALSE': 'I_FALSE_8',
128-
},
129-
BattleType.COSTUME_BATTLE_9: {
130-
'I_LOCAL': 'I_LOCAL_9',
131-
'I_EXIT': 'I_EXIT_9',
132-
'I_FRIENDS': 'I_FRIENDS_9',
133-
},
134-
BattleType.COSTUME_BATTLE_10: {
135-
'I_LOCAL': 'I_LOCAL_10',
136-
'I_EXIT': 'I_EXIT_10',
137-
'I_FRIENDS': 'I_FRIENDS_10',
138-
},
139-
}
38+
# 战斗主题（使用循环处理常规情况 + 特例处理）
39+
battle_theme_model = {}
40+
for i in range(1, 11):
41+
entry = {
42+
'I_LOCAL': f'I_LOCAL_{i}',
43+
'I_EXIT': f'I_EXIT_{i}',
44+
'I_FRIENDS': f'I_FRIENDS_{i}',
45+
}
46+
if i == 8: # 特殊处理第8项
47+
entry.update({
48+
'I_WIN': 'I_WIN_8',
49+
'I_DE_WIN': '_DE_WIN_8',
50+
'I_FALSE': 'I_FALSE_8'
51+
})
52+
battle_theme_model[getattr(BattleType, f"COSTUME_BATTLE_{i}")] = entry
14053

14154

14255
class CostumeBase:

0 commit comments

Comments
 (0)