Skip to content

Commit 59bdfd7

Browse files
author
07218
committed
Merge branch 'master' of github.com:zzliux/assttyys_autojs into hm_dev
2 parents 924676d + 3ecd2f6 commit 59bdfd7

File tree

4 files changed

+246
-26
lines changed

4 files changed

+246
-26
lines changed

‎src/common/funcList/001_准备.ts‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -68,43 +68,42 @@ export class Func001 implements IFuncOrigin {
6868
}];
6969
operatorFunc(thisScript: Script, thisOperator: IFuncOperator[]): boolean {
7070
const thisconf = thisScript.scheme.config['1'];
71-
if (thisScript.oper({
72-
id: 1,
73-
name: '准备界面识别',
74-
operator: [{ desc: thisOperator[2].desc }]
75-
}) && !thisScript.oper({
76-
name: '准备界面识别',
77-
operator: [thisOperator[3]]
78-
}) || thisScript.oper({
79-
id: 1,
80-
name: '准备界面识别',
81-
operator: [{ desc: thisOperator[4].desc }]
82-
})) {
83-
thisScript.regionClick([thisOperator[0].oper[0]]);
84-
thisScript.myToast('战斗主题非简约主题，部分功能失效，请及时跟换', 10000);
85-
return true;
86-
}
71+
const exitOper = [thisOperator[0].oper[1], thisOperator[0].oper[2]];
72+
const themeDescList = [
73+
'凛霜寒雪',
74+
'春缕含青',
75+
'蝶寻花踪',
76+
'雅乐之邦',
77+
'莲华圣域',
78+
'笼梦之境',
79+
'辰烁奇夜',
80+
'流焰蝶舞',
81+
'简约',
82+
];
8783
if (thisconf.exitBeforeReady) {
8884
return thisScript.oper({
8985
id: 1,
9086
name: '准备界面_退出',
91-
operator: [{
92-
desc: '准备界面_未准备',
93-
oper: [thisOperator[0].oper[1], thisOperator[0].oper[2]]
94-
}]
87+
operator: themeDescList.map(desc => ({
88+
desc: '准备界面_未准备_' + desc,
89+
oper: exitOper
90+
}))
9591
}, 0)
9692
} else {
9793
if (thisScript.oper({
9894
id: 1,
9995
name: '准备',
100-
operator: [{
101-
desc: '准备界面_未准备',
96+
operator: themeDescList.map(desc => ({
97+
desc: '准备界面_未准备_' + desc,
10298
oper: [thisOperator[0].oper[0]]
103-
}]
99+
}))
104100
}, 0) || thisScript.oper({
105101
id: 1,
106102
name: '手动修正自动',
107-
operator: [thisOperator[1]]
103+
operator: themeDescList.map(desc => ({
104+
desc: '战斗界面_手动状态_' + desc,
105+
oper: [thisOperator[1].oper[0]]
106+
}))
108107
}, 1000)) {
109108

110109
// 每点一次准备 重置一次红标状态

‎src/common/funcList/519_寮管理攻打道馆.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,6 @@ export class Func519 implements IFuncOrigin {
160160
desc: [1280, 720,
161161
[
162162
[center, 512, 653, 0xf0ebd9],
163-
[center, 570, 627, 0xd19e71],
164-
[center, 593, 671, 0xd1a175],
165163
[right, 664, 649, 0xed8901],
166164
[right, 673, 649, 0xe78501],
167165
[center, 622, 648, 0xebe7d5],

‎src/common/multiDetectColors.ts‎

Lines changed: 217 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,114 @@ const multiDetectColors: IMultiDetectColorsOrigin = {
1818
]
1919
]
2020
},
21+
'准备界面_未准备_简约': {
22+
desc: [
23+
1280, 720,
24+
[
25+
[right, 1240, 702, 0xcead83],
26+
[right, 1182, 586, 0xf7e6c3],
27+
[center, 360, 699, 0x241818],
28+
[left, 32, 23, 0xdbb48b],
29+
[right, 1122, 698, 0xddbb8f],
30+
]
31+
]
32+
},
33+
'准备界面_未准备_凛霜寒雪': {
34+
desc: [
35+
1280, 720,
36+
[
37+
[right, 1240, 702, 0xcead83],
38+
[right, 1182, 586, 0xf7e6c3],
39+
[center, 360, 699, 0x241818],
40+
[left, 32, 23, 0xb8def6],
41+
[right, 1122, 698, 0xddbb8f],
42+
]
43+
]
44+
},
45+
'准备界面_未准备_春缕含青': {
46+
desc: [
47+
1280, 720,
48+
[
49+
[right, 1240, 702, 0xcead83],
50+
[right, 1182, 586, 0xf7e6c3],
51+
[center, 360, 699, 0x241818],
52+
[left, 32, 23, 0xffe4ac],
53+
[right, 1122, 698, 0xddbb8f],
54+
]
55+
]
56+
},
57+
'准备界面_未准备_蝶寻花踪': {
58+
desc: [
59+
1280, 720,
60+
[
61+
[right, 1240, 702, 0xcead83],
62+
[right, 1182, 586, 0xf7e6c3],
63+
[center, 360, 699, 0x241818],
64+
[left, 32, 23, 0xf3e0bb],
65+
[right, 1122, 698, 0xddbb8f],
66+
]
67+
]
68+
},
69+
'准备界面_未准备_雅乐之邦': {
70+
desc: [
71+
1280, 720,
72+
[
73+
[right, 1240, 702, 0xcead83],
74+
[right, 1182, 586, 0xf7e6c3],
75+
[center, 360, 699, 0x241818],
76+
[left, 32, 23, 0xdcca90],
77+
[right, 1122, 698, 0xddbb8f],
78+
]
79+
]
80+
},
81+
'准备界面_未准备_莲华圣域': {
82+
desc: [
83+
1280, 720,
84+
[
85+
[right, 1240, 702, 0xcead83],
86+
[right, 1182, 586, 0xf7e6c3],
87+
[center, 360, 699, 0x241818],
88+
[left, 32, 23, 0x928865],
89+
[right, 1122, 698, 0xddbb8f],
90+
]
91+
]
92+
},
93+
'准备界面_未准备_笼梦之境': {
94+
desc: [
95+
1280, 720,
96+
[
97+
[right, 1240, 702, 0xcead83],
98+
[right, 1182, 586, 0xf7e6c3],
99+
[center, 360, 699, 0x241818],
100+
[left, 32, 23, 0x8fcdff],
101+
[right, 1122, 698, 0xddbb8f],
102+
]
103+
]
104+
},
105+
'准备界面_未准备_辰烁奇夜': {
106+
desc: [
107+
1280, 720,
108+
[
109+
[right, 1240, 702, 0xcead83],
110+
[right, 1182, 586, 0xf7e6c3],
111+
[center, 360, 699, 0x241818],
112+
[left, 32, 23, 0xe1d591],
113+
[right, 1122, 698, 0xddbb8f],
114+
]
115+
]
116+
},
117+
'准备界面_未准备_流焰蝶舞': {
118+
desc: [
119+
1280, 720,
120+
[
121+
[right, 1240, 702, 0xcead83],
122+
[right, 1182, 586, 0xf7e6c3],
123+
[center, 360, 699, 0x241818],
124+
[left, 32, 23, 0xf9ad9b],
125+
[right, 1122, 698, 0xddbb8f],
126+
]
127+
]
128+
},
21129
'准备界面_已准备': {
22130
desc: [1280, 720,
23131
[
@@ -55,6 +163,115 @@ const multiDetectColors: IMultiDetectColorsOrigin = {
55163
]
56164
],
57165
},
166+
'战斗界面_手动状态_简约': {
167+
desc: [1280, 720,
168+
[
169+
[left, 34, 23, 0xdbb48b],
170+
[left, 106, 24, 0xcfa375],
171+
[right, 1270, 700, 0x241919],
172+
[right, 1270, 130, 0x422f1d],
173+
[left, 48, 670, 0xeec8ab],
174+
[left, 82, 669, 0xf0caac],
175+
[left, 48, 661, 0xf0caac],
176+
]
177+
],
178+
},
179+
'战斗界面_手动状态_凛霜寒雪': {
180+
desc: [1280, 720,
181+
[
182+
[left, 34, 23, 0xb9def6],
183+
[left, 106, 24, 0xa6d2f2],
184+
[right, 1270, 700, 0x769bc2],
185+
[left, 48, 670, 0x2e639a],
186+
[left, 82, 669, 0x4977a7],
187+
[left, 48, 661, 0xbfd0e0],
188+
]
189+
],
190+
},
191+
'战斗界面_手动状态_春缕含青': {
192+
desc: [1280, 720,
193+
[
194+
[left, 34, 23, 0xffe4ad],
195+
[left, 106, 24, 0xffe8b9],
196+
[right, 1270, 700, 0x5a4734],
197+
[left, 48, 670, 0x655542],
198+
[left, 82, 683, 0xc3b97d],
199+
[left, 117, 614, 0xf8f4dc],
200+
]
201+
],
202+
},
203+
'战斗界面_手动状态_蝶寻花踪': {
204+
desc: [1280, 720,
205+
[
206+
[left, 46, 671, 0xfde9e0],
207+
[left, 117, 614, 0xfbe6dd],
208+
[left, 78, 651, 0xf9e3da],
209+
[left, 33, 25, 0xfff0c2],
210+
[left, 106, 23, 0xfdf2cd],
211+
[left, 92, 707, 0x306465],
212+
]
213+
],
214+
},
215+
'战斗界面_手动状态_雅乐之邦': {
216+
desc: [1280, 720,
217+
[
218+
[left, 34, 25, 0xecd89c],
219+
[left, 107, 25, 0xefdaa0],
220+
[left, 46, 670, 0xfce8de],
221+
[left, 25, 703, 0x426559],
222+
[left, 117, 614, 0xfbe6dd],
223+
[left, 63, 684, 0xcccca8],
224+
]
225+
],
226+
},
227+
'战斗界面_手动状态_莲华圣域': {
228+
desc: [1280, 720,
229+
[
230+
[left, 37, 26, 0xd8b877],
231+
[left, 108, 25, 0xdcbe83],
232+
[left, 46, 670, 0xfbf2ce],
233+
[left, 117, 614, 0xf9f1cd],
234+
[left, 142, 710, 0x29364b],
235+
[left, 81, 665, 0xf6edc9],
236+
]
237+
],
238+
},
239+
'战斗界面_手动状态_笼梦之境': {
240+
desc: [1280, 720,
241+
[
242+
[left, 36, 24, 0x93ccff],
243+
[left, 107, 24, 0x98cfff],
244+
[left, 47, 661, 0xd5ebf6],
245+
[left, 77, 657, 0xd9eff9],
246+
[left, 117, 614, 0xd9eef9],
247+
[left, 16, 701, 0x3f6984],
248+
]
249+
],
250+
},
251+
'战斗界面_手动状态_辰烁奇夜': {
252+
desc: [1280, 720,
253+
[
254+
[left, 34, 25, 0xeadc98],
255+
[left, 106, 25, 0xefdf9b],
256+
[left, 47, 656, 0xfcf9e0],
257+
[left, 78, 657, 0xfaf7df],
258+
[left, 117, 614, 0xf7f3dd],
259+
[left, 24, 705, 0x282b1f],
260+
]
261+
],
262+
},
263+
'战斗界面_手动状态_流焰蝶舞': {
264+
desc: [1280, 720,
265+
[
266+
[left, 47, 656, 0xfcf9e0],
267+
[left, 78, 657, 0xfaf7df],
268+
[left, 117, 614, 0xf7f3dd],
269+
[left, 36, 25, 0xf8a997],
270+
[left, 107, 24, 0xf9ac9b],
271+
[left, 24, 700, 0x8e594d],
272+
]
273+
],
274+
},
58275
'退出结算_左上角贪吃鬼': {
59276
desc: [1280, 720,
60277
[

‎src/common/version.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1437,6 +1437,12 @@ export const versionList = [{
14371437
}, {
14381438
version: '20251211_04',
14391439
desc: 'fix: 修复逢魔boss识别问题'
1440+
}, {
1441+
version: '20251213_01',
1442+
desc: '准备功能适配战斗主题【凛霜寒雪、春缕含青、蝶寻花踪、雅乐之邦、莲华圣域、笼梦之境、辰烁奇夜、流焰蝶舞】'
1443+
}, {
1444+
version: '20251213_01',
1445+
desc: 'fix: 修复准备功能使用战斗主题时点击准备和切换手动状态失效'
14401446
}, {
14411447
version: '20251225_01',
14421448
desc: 'fix: 506添加首领退治开关，适配会长副会长场景'

0 commit comments

Comments
 (0)