cc-pets 1.4.5 → 1.4.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Resources/phrases.default.txt +14 -2
- package/Sources/CCPets/CCPetsAppDelegate.m +42 -1
- package/Sources/CCPets/CCPetsPhrases.h +4 -0
- package/Sources/CCPets/CCPetsPhrases.m +63 -0
- package/Sources/CCPets/CCPetsPhrasesEditor.m +13 -9
- package/Sources/CCPets/PetView.h +7 -0
- package/Sources/CCPets/PetView.m +132 -0
- package/package.json +1 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
# 碎碎念台词配置,修改后立即生效
|
|
2
2
|
# 一行一句,直接改字、加行、删行就行。`#` 是注释。
|
|
3
3
|
# 每句 30 字以内。
|
|
4
|
+
# 每个场景支持多行配置,如果一行都没有则不触发情景主动说话。
|
|
4
5
|
# 可以插进台词里的实时数据(连花括号一起写):
|
|
5
6
|
# {quota5h} 5 小时额度剩余,如 12%
|
|
6
7
|
# {resetTime} 额度回血时间,如 18:30
|
|
@@ -11,7 +12,6 @@
|
|
|
11
12
|
# 用了数据的句子,在拿不到该数据时会整条跳过。
|
|
12
13
|
|
|
13
14
|
# ============ 它自己想说话的时候 ============
|
|
14
|
-
# 每个场景支持多行配置,如果一行都没有则不触发情景主动说话。
|
|
15
15
|
|
|
16
16
|
[idle] # 闲着没事
|
|
17
17
|
发会儿呆。
|
|
@@ -85,7 +85,6 @@
|
|
|
85
85
|
再跑就没了。
|
|
86
86
|
离 {resetTime} 还早呢。
|
|
87
87
|
|
|
88
|
-
|
|
89
88
|
# ============ 状态播报 ============
|
|
90
89
|
# agent工作时的状态播报,需要至少保留一行
|
|
91
90
|
|
|
@@ -169,3 +168,16 @@
|
|
|
169
168
|
有点事找你聊聊。
|
|
170
169
|
抬头看一眼。
|
|
171
170
|
这儿有情况。
|
|
171
|
+
|
|
172
|
+
|
|
173
|
+
# ============ 连击互动配置 ============
|
|
174
|
+
|
|
175
|
+
[click_heart] # 连续点击后开心
|
|
176
|
+
嘿嘿,再摸摸~
|
|
177
|
+
好喜欢!
|
|
178
|
+
今天也要开心呀~
|
|
179
|
+
|
|
180
|
+
[click_annoyed] # 连续点击过多后烦躁
|
|
181
|
+
好啦好啦!
|
|
182
|
+
别戳了!
|
|
183
|
+
我要生气啦!
|
|
@@ -18,6 +18,8 @@
|
|
|
18
18
|
static const NSTimeInterval PendingApprovalTTL = 24 * 60 * 60;
|
|
19
19
|
static const NSUInteger PendingApprovalLimit = 100;
|
|
20
20
|
static const unsigned long long UpdateLogSizeLimit = 1024 * 1024;
|
|
21
|
+
static NSString *const PetInteractionPhrasesV1MigratedKey =
|
|
22
|
+
@"CCPetsInteractionPhrasesV1Migrated";
|
|
21
23
|
|
|
22
24
|
static void TrimUpdateLog(NSString *path) {
|
|
23
25
|
NSFileHandle *handle = [NSFileHandle fileHandleForReadingAtPath:path];
|
|
@@ -355,6 +357,32 @@ static NSString *const PetSpeechFrequencyChatty = @"chatty";
|
|
|
355
357
|
sender.state = !enabled ? NSControlStateValueOn : NSControlStateValueOff;
|
|
356
358
|
if (enabled) [self hideSpeechBubble];
|
|
357
359
|
}
|
|
360
|
+
- (void)togglePetInteraction:(NSButton *)sender {
|
|
361
|
+
NSUserDefaults *defaults = NSUserDefaults.standardUserDefaults;
|
|
362
|
+
BOOL enabled = ![defaults boolForKey:PetInteractionEnabledKey];
|
|
363
|
+
[defaults setBool:enabled forKey:PetInteractionEnabledKey];
|
|
364
|
+
sender.state = enabled ? NSControlStateValueOn : NSControlStateValueOff;
|
|
365
|
+
}
|
|
366
|
+
- (void)setPetInteractionHeartThreshold:(NSMenuItem *)sender {
|
|
367
|
+
NSNumber *value = [sender.representedObject isKindOfClass:NSNumber.class] ?
|
|
368
|
+
sender.representedObject : @3;
|
|
369
|
+
[NSUserDefaults.standardUserDefaults setInteger:MAX((NSInteger)2, value.integerValue)
|
|
370
|
+
forKey:PetInteractionHeartThresholdKey];
|
|
371
|
+
}
|
|
372
|
+
- (void)setPetInteractionAnnoyedThreshold:(NSMenuItem *)sender {
|
|
373
|
+
NSNumber *value = [sender.representedObject isKindOfClass:NSNumber.class] ?
|
|
374
|
+
sender.representedObject : @10;
|
|
375
|
+
NSInteger heart = MAX((NSInteger)2, [NSUserDefaults.standardUserDefaults
|
|
376
|
+
integerForKey:PetInteractionHeartThresholdKey]);
|
|
377
|
+
[NSUserDefaults.standardUserDefaults setInteger:MAX(heart + 1, value.integerValue)
|
|
378
|
+
forKey:PetInteractionAnnoyedThresholdKey];
|
|
379
|
+
}
|
|
380
|
+
- (void)setPetInteractionInterval:(NSMenuItem *)sender {
|
|
381
|
+
NSNumber *value = [sender.representedObject isKindOfClass:NSNumber.class] ?
|
|
382
|
+
sender.representedObject : @1.2;
|
|
383
|
+
[NSUserDefaults.standardUserDefaults setDouble:MAX(0.4, MIN(3.0, value.doubleValue))
|
|
384
|
+
forKey:PetInteractionIntervalKey];
|
|
385
|
+
}
|
|
358
386
|
// 频率档位。改完立刻生效——四道闸都是现读的,不缓存。
|
|
359
387
|
// 顺手把冷却清掉,否则刚调高档位还要等完上一档的冷却才见效,会让人以为没生效。
|
|
360
388
|
- (void)setSpeechFrequency:(NSMenuItem *)sender {
|
|
@@ -880,6 +908,11 @@ static NSString *const PetSpeechFrequencyChatty = @"chatty";
|
|
|
880
908
|
// 台词全在这个文件里,代码里没有第二份。首次启动先从出厂词库拷一份出来,
|
|
881
909
|
// 否则新装的桌宠一句话都不会说。
|
|
882
910
|
PetPhrasesEnsureFileExists();
|
|
911
|
+
if (![NSUserDefaults.standardUserDefaults boolForKey:PetInteractionPhrasesV1MigratedKey] &&
|
|
912
|
+
PetPhrasesEnsureInteractionSections()) {
|
|
913
|
+
[NSUserDefaults.standardUserDefaults setBool:YES
|
|
914
|
+
forKey:PetInteractionPhrasesV1MigratedKey];
|
|
915
|
+
}
|
|
883
916
|
self.managedByCLI = [NSProcessInfo.processInfo.arguments containsObject:@"--managed"];
|
|
884
917
|
NSString *binaryDir = NSProcessInfo.processInfo.arguments.firstObject.stringByStandardizingPath.stringByDeletingLastPathComponent;
|
|
885
918
|
NSBundle *mainBundle = NSBundle.mainBundle;
|
|
@@ -902,7 +935,11 @@ static NSString *const PetSpeechFrequencyChatty = @"chatty";
|
|
|
902
935
|
[defaults registerDefaults:@{
|
|
903
936
|
SystemCPUEnabledKey: @YES,
|
|
904
937
|
SystemTemperatureEnabledKey: @YES,
|
|
905
|
-
SystemMemoryEnabledKey: @YES
|
|
938
|
+
SystemMemoryEnabledKey: @YES,
|
|
939
|
+
PetInteractionEnabledKey: @YES,
|
|
940
|
+
PetInteractionHeartThresholdKey: @3,
|
|
941
|
+
PetInteractionAnnoyedThresholdKey: @10,
|
|
942
|
+
PetInteractionIntervalKey: @1.2
|
|
906
943
|
}];
|
|
907
944
|
if (![defaults boolForKey:StatusBubblePreferenceV2Key]) {
|
|
908
945
|
[defaults setBool:YES forKey:StatusBubbleExpandedKey];
|
|
@@ -970,6 +1007,10 @@ static NSString *const PetSpeechFrequencyChatty = @"chatty";
|
|
|
970
1007
|
weakSelf.petDragging = dragging;
|
|
971
1008
|
if (!dragging) [weakSelf scheduleQuotaDashboardHide];
|
|
972
1009
|
};
|
|
1010
|
+
self.petView.interactionPhraseRequested = ^(NSString *tag) {
|
|
1011
|
+
NSString *text = PetPhraseForTag(tag, [weakSelf speechSlots]);
|
|
1012
|
+
if (text.length > 0) [weakSelf presentSpeechText:text];
|
|
1013
|
+
};
|
|
973
1014
|
// 附属面板的跟随必须挂在窗口自身的移动通知上,不能只挂 PetView 的拖动回调:
|
|
974
1015
|
// panel 开了 movableByWindowBackground,按在 PetView 之外的透明边上时由 AppKit
|
|
975
1016
|
// 直接搬窗口,PetView 的 mouseDragged 根本不触发,气泡就会留在原地。
|
|
@@ -18,6 +18,8 @@ extern NSString *const PetPhraseTagLateNight; // 深夜
|
|
|
18
18
|
extern NSString *const PetPhraseTagLongSession; // 久坐
|
|
19
19
|
extern NSString *const PetPhraseTagWake; // 久别重逢
|
|
20
20
|
extern NSString *const PetPhraseTagIdle; // 闲着
|
|
21
|
+
extern NSString *const PetPhraseTagClickHeart; // 连击后开心
|
|
22
|
+
extern NSString *const PetPhraseTagClickAnnoyed; // 连击过多后烦躁
|
|
21
23
|
|
|
22
24
|
// Agent 状态的宠物口吻文案。这些不是"额外说话",而是状态卡副行的正文来源——
|
|
23
25
|
// 每个 hook 状态都由宠物来讲,所以不受说话预算限制。
|
|
@@ -82,6 +84,8 @@ NSString *PetPhraseTextMergedFromLegacy(NSString *legacyText, NSString *defaultT
|
|
|
82
84
|
// 这一刻出现一次,之后运行时只认用户文件。两份词库同时存在于运行期就必然要回答
|
|
83
85
|
// "以谁为准",那正是 merge/replace 那套让人看不懂的根源。
|
|
84
86
|
BOOL PetPhrasesEnsureFileExists(void);
|
|
87
|
+
// 给升级用户补一次新加入的连击互动小节;已有小节(包括用户主动留空)绝不覆盖。
|
|
88
|
+
BOOL PetPhrasesEnsureInteractionSections(void);
|
|
85
89
|
|
|
86
90
|
// 取一条填好槽位的话。取不到返回 nil(调用方应当直接不说话,而不是显示占位符)。
|
|
87
91
|
// slots 的键是白名单里的槽位名(不含花括号),值统一按字符串处理。
|
|
@@ -7,6 +7,8 @@ NSString *const PetPhraseTagLateNight = @"late_night";
|
|
|
7
7
|
NSString *const PetPhraseTagLongSession = @"long_session";
|
|
8
8
|
NSString *const PetPhraseTagWake = @"wake";
|
|
9
9
|
NSString *const PetPhraseTagIdle = @"idle";
|
|
10
|
+
NSString *const PetPhraseTagClickHeart = @"click_heart";
|
|
11
|
+
NSString *const PetPhraseTagClickAnnoyed = @"click_annoyed";
|
|
10
12
|
|
|
11
13
|
NSString *const PetPhraseTagStateStarting = @"state_starting";
|
|
12
14
|
NSString *const PetPhraseTagStateIdle = @"state_idle";
|
|
@@ -120,6 +122,9 @@ NSArray<NSString *> *PetPhraseAllTags(void) {
|
|
|
120
122
|
PetPhraseTagWake, PetPhraseTagLateNight, PetPhraseTagLongSession,
|
|
121
123
|
PetPhraseTagQuotaLow] mutableCopy];
|
|
122
124
|
[all addObjectsFromArray:PetPhraseStateTags()];
|
|
125
|
+
// 互动标签最初就是追加到升级用户文件末尾的;稳定顺序必须与磁盘迁移结果一致,
|
|
126
|
+
// 否则删除标签后的“原位恢复”会跨过全部 state_ 小节,插到错误位置。
|
|
127
|
+
[all addObjectsFromArray:@[PetPhraseTagClickHeart, PetPhraseTagClickAnnoyed]];
|
|
123
128
|
tags = all;
|
|
124
129
|
});
|
|
125
130
|
return tags;
|
|
@@ -134,6 +139,8 @@ NSString *PetPhraseTagDescription(NSString *tag) {
|
|
|
134
139
|
PetPhraseTagFail: @"连续失败", PetPhraseTagWake: @"隔了很久又开工",
|
|
135
140
|
PetPhraseTagLateNight: @"深夜还在干", PetPhraseTagLongSession: @"连续工作很久",
|
|
136
141
|
PetPhraseTagQuotaLow: @"额度告急",
|
|
142
|
+
PetPhraseTagClickHeart: @"连续点击后开心",
|
|
143
|
+
PetPhraseTagClickAnnoyed: @"连续点击过多后烦躁",
|
|
137
144
|
PetPhraseTagStateStarting: @"正在启动", PetPhraseTagStateIdle: @"待机中",
|
|
138
145
|
PetPhraseTagStateThinking: @"正在思考", PetPhraseTagStateTool: @"正在用工具",
|
|
139
146
|
PetPhraseTagStateToolBash: @"正在执行命令", PetPhraseTagStateToolEdit: @"正在编辑文件",
|
|
@@ -255,6 +262,36 @@ static NSDictionary<NSString *, NSArray<NSString *> *> *ParsePhrasesText(NSStrin
|
|
|
255
262
|
return groups;
|
|
256
263
|
}
|
|
257
264
|
|
|
265
|
+
BOOL PetPhrasesEnsureInteractionSections(void) {
|
|
266
|
+
NSString *path = PetPhrasesFilePath();
|
|
267
|
+
NSString *text = [NSString stringWithContentsOfFile:path
|
|
268
|
+
encoding:NSUTF8StringEncoding error:nil];
|
|
269
|
+
NSString *defaultText = [NSString stringWithContentsOfFile:PetPhrasesDefaultFilePath()
|
|
270
|
+
encoding:NSUTF8StringEncoding error:nil];
|
|
271
|
+
if (text.length == 0 || defaultText.length == 0) return NO;
|
|
272
|
+
|
|
273
|
+
NSDictionary<NSString *, NSArray<NSString *> *> *existing = ParsePhrasesText(text, nil);
|
|
274
|
+
NSDictionary<NSString *, NSArray<NSString *> *> *defaults = ParsePhrasesText(defaultText, nil);
|
|
275
|
+
NSArray<NSString *> *interactionTags =
|
|
276
|
+
@[PetPhraseTagClickHeart, PetPhraseTagClickAnnoyed];
|
|
277
|
+
NSMutableString *updated = [text mutableCopy];
|
|
278
|
+
NSMutableString *addition = [NSMutableString string];
|
|
279
|
+
for (NSString *tag in interactionTags) {
|
|
280
|
+
// 字典里存在空数组也表示用户已经拥有并可能主动清空了这个小节,不能覆盖。
|
|
281
|
+
if (existing[tag] != nil) continue;
|
|
282
|
+
NSArray<NSString *> *lines = defaults[tag];
|
|
283
|
+
if (lines.count == 0) continue;
|
|
284
|
+
[addition appendFormat:@"\n\n[%@] # %@\n", tag, PetPhraseTagDescription(tag)];
|
|
285
|
+
[addition appendString:[lines componentsJoinedByString:@"\n"]];
|
|
286
|
+
}
|
|
287
|
+
if (addition.length == 0) return YES;
|
|
288
|
+
while ([updated hasSuffix:@"\n"]) [updated deleteCharactersInRange:
|
|
289
|
+
NSMakeRange(updated.length - 1, 1)];
|
|
290
|
+
[updated appendString:addition];
|
|
291
|
+
[updated appendString:@"\n"];
|
|
292
|
+
return [updated writeToFile:path atomically:YES encoding:NSUTF8StringEncoding error:nil];
|
|
293
|
+
}
|
|
294
|
+
|
|
258
295
|
// 从磁盘读。mtime 没变就直接用上次的结果——取句子本来就低频,这点开销可以忽略,
|
|
259
296
|
// 换来的是用户改完保存立刻生效,不用重启桌宠。
|
|
260
297
|
static NSDictionary<NSString *, NSArray<NSString *> *> *LoadUserPhrases(void) {
|
|
@@ -401,6 +438,20 @@ static BOOL IsHeaderLine(NSString *rawLine, NSString *tag) {
|
|
|
401
438
|
return [line isEqualToString:[NSString stringWithFormat:@"[%@]", tag]];
|
|
402
439
|
}
|
|
403
440
|
|
|
441
|
+
// 标签名或括号被删掉一部分时,出厂小节头后面的中文说明仍能唯一标识它属于哪个情境:
|
|
442
|
+
// [click_hear] # 连续点击后开心
|
|
443
|
+
// click_heart] # 连续点击后开心
|
|
444
|
+
// [] # 连续点击后开心
|
|
445
|
+
// 这些都应在原行恢复,而不是另外插入一个正确标签、把损坏行留成未知小节。
|
|
446
|
+
static BOOL IsDamagedHeaderLine(NSString *rawLine, NSString *tag) {
|
|
447
|
+
if (IsHeaderLine(rawLine, tag)) return NO;
|
|
448
|
+
NSRange hash = [rawLine rangeOfString:@"#"];
|
|
449
|
+
if (hash.location == NSNotFound) return NO;
|
|
450
|
+
NSString *comment = [[rawLine substringFromIndex:hash.location + 1]
|
|
451
|
+
stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceCharacterSet];
|
|
452
|
+
return [comment isEqualToString:PetPhraseTagDescription(tag)];
|
|
453
|
+
}
|
|
454
|
+
|
|
404
455
|
NSString *PetPhraseTextMergedFromLegacy(NSString *legacyText, NSString *defaultText) {
|
|
405
456
|
if (legacyText.length == 0) return defaultText;
|
|
406
457
|
|
|
@@ -467,6 +518,18 @@ NSString *PetPhraseTextWithRestoredTags(NSString *text,
|
|
|
467
518
|
NSMutableArray<NSString *> *added = [NSMutableArray array];
|
|
468
519
|
NSArray<NSString *> *order = PetPhraseAllTags();
|
|
469
520
|
|
|
521
|
+
// 标签名被删空、删掉一部分或括号不完整时,只要中文情境说明还在,就能无歧义地
|
|
522
|
+
// 确认原标签;直接替换原行,保证恢复位置不变。
|
|
523
|
+
for (NSString *tag in order) {
|
|
524
|
+
if (HeaderIndex(lines, tag) >= 0) continue;
|
|
525
|
+
for (NSUInteger index = 0; index < lines.count; index++) {
|
|
526
|
+
if (!IsDamagedHeaderLine(lines[index], tag)) continue;
|
|
527
|
+
lines[index] = SectionHeaderLine(tag);
|
|
528
|
+
[added addObject:tag];
|
|
529
|
+
break;
|
|
530
|
+
}
|
|
531
|
+
}
|
|
532
|
+
|
|
470
533
|
for (NSUInteger position = 0; position < order.count; position++) {
|
|
471
534
|
NSString *tag = order[position];
|
|
472
535
|
if (HeaderIndex(lines, tag) >= 0) continue;
|
|
@@ -207,10 +207,11 @@ static void (^PetPhrasesSpeakHandler)(NSString *);
|
|
|
207
207
|
// 保存时校验,不做实时校验——边打边标红只会干扰输入,而且写到一半的行必然是"错"的。
|
|
208
208
|
// 返回是否真的写进了文件(被校验拦下、被 mtime 冲突取消都算没写)。
|
|
209
209
|
- (BOOL)performSave {
|
|
210
|
-
//
|
|
210
|
+
// 标签被删掉时先补回原位,并阻止本次保存。
|
|
211
211
|
//
|
|
212
212
|
// 只报错是把人卡死:编辑器里已经看不到那一行了,用户既不知道少的是哪个,也不知道
|
|
213
|
-
//
|
|
213
|
+
// 该写成什么样。补回后仍不能直接写盘——否则“标签不可删除”只是句提示,用户看不到
|
|
214
|
+
// 修复结果就已经覆盖了文件。必须让用户确认恢复位置和内容,再主动保存一次。
|
|
214
215
|
NSArray<NSString *> *restored = nil;
|
|
215
216
|
NSString *text = self.textView.string ?: @"";
|
|
216
217
|
NSString *repaired = PetPhraseTextWithRestoredTags(text, &restored);
|
|
@@ -222,6 +223,8 @@ static void (^PetPhrasesSpeakHandler)(NSString *);
|
|
|
222
223
|
[self.textView didChangeText];
|
|
223
224
|
text = repaired;
|
|
224
225
|
}
|
|
226
|
+
[self presentIssues:@[] blocking:YES restored:restored];
|
|
227
|
+
return NO;
|
|
225
228
|
}
|
|
226
229
|
|
|
227
230
|
NSArray<PetPhraseIssue *> *issues = PetPhraseValidateText(text);
|
|
@@ -243,12 +246,10 @@ static void (^PetPhrasesSpeakHandler)(NSString *);
|
|
|
243
246
|
self.loadedStamp = [NSFileManager.defaultManager attributesOfItemAtPath:path
|
|
244
247
|
error:nil][NSFileModificationDate];
|
|
245
248
|
|
|
246
|
-
if (issues.count > 0
|
|
247
|
-
[self presentIssues:issues blocking:NO restored:
|
|
248
|
-
[self showStatus:
|
|
249
|
-
|
|
250
|
-
[NSString stringWithFormat:@"已保存,有 %lu 处提示", (unsigned long)issues.count]
|
|
251
|
-
warning:YES];
|
|
249
|
+
if (issues.count > 0) {
|
|
250
|
+
[self presentIssues:issues blocking:NO restored:nil];
|
|
251
|
+
[self showStatus:[NSString stringWithFormat:@"已保存,有 %lu 处提示",
|
|
252
|
+
(unsigned long)issues.count] warning:YES];
|
|
252
253
|
return YES;
|
|
253
254
|
}
|
|
254
255
|
[self showStatus:@"已保存,立刻生效。" warning:NO];
|
|
@@ -290,6 +291,7 @@ static void (^PetPhrasesSpeakHandler)(NSString *);
|
|
|
290
291
|
[lines addObject:[NSString stringWithFormat:
|
|
291
292
|
@"标签不能删,已经帮你把 %@ 加回原位了(⌘Z 可撤销)。",
|
|
292
293
|
[names componentsJoinedByString:@"、"]]];
|
|
294
|
+
if (blocking) [lines addObject:@"本次没有保存,请检查恢复位置后再保存一次。"];
|
|
293
295
|
[lines addObject:@""];
|
|
294
296
|
}
|
|
295
297
|
for (PetPhraseIssue *issue in issues) {
|
|
@@ -315,7 +317,9 @@ static void (^PetPhrasesSpeakHandler)(NSString *);
|
|
|
315
317
|
[alert addButtonWithTitle:@"好"];
|
|
316
318
|
[alert runModal];
|
|
317
319
|
if (blocking) {
|
|
318
|
-
[self showStatus
|
|
320
|
+
[self showStatus:restored.count > 0 ?
|
|
321
|
+
@"标签已恢复,本次未保存;请检查后再保存一次。" :
|
|
322
|
+
@"有必须改的地方,还没保存。" warning:YES];
|
|
319
323
|
}
|
|
320
324
|
}
|
|
321
325
|
|
package/Sources/CCPets/PetView.h
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
#import <Cocoa/Cocoa.h>
|
|
2
2
|
|
|
3
|
+
// 连击互动配置。放在 PetView 公共契约里,菜单和点击处理共用同一组 defaults 键。
|
|
4
|
+
extern NSString *const PetInteractionEnabledKey;
|
|
5
|
+
extern NSString *const PetInteractionHeartThresholdKey;
|
|
6
|
+
extern NSString *const PetInteractionAnnoyedThresholdKey;
|
|
7
|
+
extern NSString *const PetInteractionIntervalKey;
|
|
8
|
+
|
|
3
9
|
@interface PetView : NSView <NSMenuDelegate>
|
|
4
10
|
@property(nonatomic) NSImage *sheet;
|
|
5
11
|
@property(nonatomic) NSInteger spriteRowCount;
|
|
@@ -22,6 +28,7 @@
|
|
|
22
28
|
@property id localMouseMonitor;
|
|
23
29
|
@property(copy) void (^pocketHoverChanged)(BOOL hovering);
|
|
24
30
|
@property(copy) void (^dragStateChanged)(BOOL dragging);
|
|
31
|
+
@property(copy) void (^interactionPhraseRequested)(NSString *tag);
|
|
25
32
|
@property(copy) NSArray<NSDictionary *> *(^petOptionsRequested)(void);
|
|
26
33
|
@property(copy) void (^switchPetRequested)(NSString *petID);
|
|
27
34
|
@property(copy) BOOL (^deletePetRequested)(NSString *petID);
|
package/Sources/CCPets/PetView.m
CHANGED
|
@@ -8,6 +8,11 @@
|
|
|
8
8
|
// 单独 extern 而不 import 那个头文件,是因为它反过来 import 了 PetView.h。
|
|
9
9
|
extern NSString *const PetSpeechFrequencyKey;
|
|
10
10
|
|
|
11
|
+
NSString *const PetInteractionEnabledKey = @"CCPetsInteractionEnabled";
|
|
12
|
+
NSString *const PetInteractionHeartThresholdKey = @"CCPetsInteractionHeartThreshold";
|
|
13
|
+
NSString *const PetInteractionAnnoyedThresholdKey = @"CCPetsInteractionAnnoyedThreshold";
|
|
14
|
+
NSString *const PetInteractionIntervalKey = @"CCPetsInteractionInterval";
|
|
15
|
+
|
|
11
16
|
// 按下后位移超过这个距离才判定为拖动,之内视为点击。
|
|
12
17
|
static const CGFloat PetDragThreshold = 3.0;
|
|
13
18
|
// 菜单里自绘行的宽度:主菜单要撑满 menu.minimumWidth,子菜单按自身内容收窄,
|
|
@@ -100,6 +105,9 @@ typedef NS_ENUM(NSInteger, PetMicroBehaviorKind) {
|
|
|
100
105
|
// 事件,但 NSWindowDidMoveNotification 照发,这是拖动中唯一拿得到的位移信号。
|
|
101
106
|
@property NSPoint lastDragWindowOrigin;
|
|
102
107
|
@property BOOL observingWindowMove;
|
|
108
|
+
// 连击只统计没有变成拖动的左键释放。
|
|
109
|
+
@property NSInteger interactionClickCount;
|
|
110
|
+
@property NSTimeInterval lastInteractionClickAt;
|
|
103
111
|
// 按格栅格化的位图。视网膜下每格 280×300×4 ≈ 328KB,整表 88 格会到 28MB,
|
|
104
112
|
// 所以设 cost 上限让它只留住真正在播的那些格。
|
|
105
113
|
@property NSCache<NSNumber *, id> *cellCache;
|
|
@@ -832,8 +840,87 @@ typedef NS_ENUM(NSInteger, PetMicroBehaviorKind) {
|
|
|
832
840
|
[self endPetDrag];
|
|
833
841
|
return;
|
|
834
842
|
}
|
|
843
|
+
[self handleInteractionClick];
|
|
844
|
+
}
|
|
845
|
+
- (void)handleInteractionClick {
|
|
846
|
+
NSUserDefaults *defaults = NSUserDefaults.standardUserDefaults;
|
|
847
|
+
if (![defaults boolForKey:PetInteractionEnabledKey]) {
|
|
848
|
+
[self playRow:7 throughFrame:5 oneShot:YES];
|
|
849
|
+
return;
|
|
850
|
+
}
|
|
851
|
+
NSTimeInterval interval = [defaults doubleForKey:PetInteractionIntervalKey];
|
|
852
|
+
interval = MAX(0.4, MIN(3.0, interval));
|
|
853
|
+
NSInteger heartThreshold = MAX((NSInteger)2,
|
|
854
|
+
[defaults integerForKey:PetInteractionHeartThresholdKey]);
|
|
855
|
+
NSInteger annoyedThreshold = MAX(heartThreshold + 1,
|
|
856
|
+
[defaults integerForKey:PetInteractionAnnoyedThresholdKey]);
|
|
857
|
+
NSTimeInterval now = CFAbsoluteTimeGetCurrent();
|
|
858
|
+
if (now - self.lastInteractionClickAt > interval) {
|
|
859
|
+
self.interactionClickCount = 0;
|
|
860
|
+
}
|
|
861
|
+
self.lastInteractionClickAt = now;
|
|
862
|
+
self.interactionClickCount++;
|
|
863
|
+
|
|
864
|
+
if (self.interactionClickCount >= annoyedThreshold) {
|
|
865
|
+
[self spawnInteractionSymbols:@[@"💢", @"╬", @"!"]
|
|
866
|
+
color:NSColor.systemOrangeColor];
|
|
867
|
+
[self playRow:5 throughFrame:7 oneShot:YES];
|
|
868
|
+
if (self.interactionPhraseRequested) {
|
|
869
|
+
self.interactionPhraseRequested(@"click_annoyed");
|
|
870
|
+
}
|
|
871
|
+
return;
|
|
872
|
+
}
|
|
873
|
+
if (self.interactionClickCount >= heartThreshold) {
|
|
874
|
+
[self spawnInteractionSymbols:@[@"♥︎", @"♥︎", @"♥︎"]
|
|
875
|
+
color:NSColor.systemPinkColor];
|
|
876
|
+
[self playRow:3 throughFrame:3 oneShot:YES];
|
|
877
|
+
if (self.interactionPhraseRequested) {
|
|
878
|
+
self.interactionPhraseRequested(@"click_heart");
|
|
879
|
+
}
|
|
880
|
+
return;
|
|
881
|
+
}
|
|
835
882
|
[self playRow:7 throughFrame:5 oneShot:YES];
|
|
836
883
|
}
|
|
884
|
+
- (void)spawnInteractionSymbols:(NSArray<NSString *> *)symbols color:(NSColor *)color {
|
|
885
|
+
NSTimeInterval duration = self.reduceMotion ? 0.45 : 0.95;
|
|
886
|
+
for (NSUInteger index = 0; index < symbols.count; index++) {
|
|
887
|
+
CGFloat x = 34.0 + arc4random_uniform(66);
|
|
888
|
+
CGFloat y = 104.0 + arc4random_uniform(12);
|
|
889
|
+
NSTextField *label = [NSTextField labelWithString:symbols[index]];
|
|
890
|
+
label.alignment = NSTextAlignmentCenter;
|
|
891
|
+
label.font = [NSFont systemFontOfSize:index == 0 ? 21 : 17
|
|
892
|
+
weight:NSFontWeightBold];
|
|
893
|
+
label.textColor = color;
|
|
894
|
+
label.frame = NSMakeRect(x, y, 30, 28);
|
|
895
|
+
label.wantsLayer = YES;
|
|
896
|
+
label.layer.zPosition = 20;
|
|
897
|
+
[self addSubview:label];
|
|
898
|
+
|
|
899
|
+
CFTimeInterval delay = index * 0.08;
|
|
900
|
+
CGPoint start = label.layer.position;
|
|
901
|
+
CGPoint end = CGPointMake(start.x + ((NSInteger)index - 1) * 10,
|
|
902
|
+
start.y + (self.reduceMotion ? 0 : 34 + index * 5));
|
|
903
|
+
CAKeyframeAnimation *position = [CAKeyframeAnimation animationWithKeyPath:@"position"];
|
|
904
|
+
position.values = @[[NSValue valueWithPoint:start], [NSValue valueWithPoint:end]];
|
|
905
|
+
CAKeyframeAnimation *opacity = [CAKeyframeAnimation animationWithKeyPath:@"opacity"];
|
|
906
|
+
opacity.values = @[@0.0, @1.0, @1.0, @0.0];
|
|
907
|
+
opacity.keyTimes = @[@0.0, @0.18, @0.68, @1.0];
|
|
908
|
+
CAKeyframeAnimation *scale = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"];
|
|
909
|
+
scale.values = @[@0.65, @1.12, @1.0];
|
|
910
|
+
scale.keyTimes = @[@0.0, @0.35, @1.0];
|
|
911
|
+
CAAnimationGroup *group = [CAAnimationGroup animation];
|
|
912
|
+
group.animations = @[position, opacity, scale];
|
|
913
|
+
group.duration = duration;
|
|
914
|
+
group.beginTime = CACurrentMediaTime() + delay;
|
|
915
|
+
group.fillMode = kCAFillModeBoth;
|
|
916
|
+
group.removedOnCompletion = NO;
|
|
917
|
+
[label.layer addAnimation:group forKey:@"interactionFloat"];
|
|
918
|
+
dispatch_after(dispatch_time(DISPATCH_TIME_NOW,
|
|
919
|
+
(int64_t)((duration + delay + 0.05) * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
|
|
920
|
+
[label removeFromSuperview];
|
|
921
|
+
});
|
|
922
|
+
}
|
|
923
|
+
}
|
|
837
924
|
// 每一格都用**原来 drawRect: 那一次绘制**预先栅格化成位图,再交给 layer。
|
|
838
925
|
//
|
|
839
926
|
// 试过两条更"聪明"的路,都不行,别改回去:
|
|
@@ -1021,6 +1108,8 @@ typedef NS_ENUM(NSInteger, PetMicroBehaviorKind) {
|
|
|
1021
1108
|
self.frameHolds = [self idleHoldsForCount:self.frames.count];
|
|
1022
1109
|
self.holdTicks = 0;
|
|
1023
1110
|
self.oneShot = NO;
|
|
1111
|
+
self.interactionClickCount = 0;
|
|
1112
|
+
self.lastInteractionClickAt = 0;
|
|
1024
1113
|
[self rebuildSpriteCache];
|
|
1025
1114
|
[self rebuildCapabilities];
|
|
1026
1115
|
[self updateLookTracking];
|
|
@@ -1420,6 +1509,49 @@ typedef NS_ENUM(NSInteger, PetMicroBehaviorKind) {
|
|
|
1420
1509
|
tag:[option[@"tag"] integerValue]];
|
|
1421
1510
|
}
|
|
1422
1511
|
notificationItem.submenu = notificationMenu;
|
|
1512
|
+
NSMenuItem *interactionItem = [menu addItemWithTitle:@"连击互动" action:nil keyEquivalent:@""];
|
|
1513
|
+
NSMenu *interactionMenu = [NSMenu new];
|
|
1514
|
+
[self addPersistentSwitchToMenu:interactionMenu
|
|
1515
|
+
title:@"启用互动"
|
|
1516
|
+
checked:[NSUserDefaults.standardUserDefaults boolForKey:PetInteractionEnabledKey]
|
|
1517
|
+
action:@selector(togglePetInteraction:)
|
|
1518
|
+
width:PetSubmenuRowWidth
|
|
1519
|
+
tag:1];
|
|
1520
|
+
NSArray<NSDictionary *> *interactionGroups = @[
|
|
1521
|
+
@{@"title": @"桃心触发", @"key": PetInteractionHeartThresholdKey,
|
|
1522
|
+
@"action": NSStringFromSelector(@selector(setPetInteractionHeartThreshold:)),
|
|
1523
|
+
@"values": @[@3, @5, @7], @"suffix": @" 次"},
|
|
1524
|
+
@{@"title": @"烦躁触发", @"key": PetInteractionAnnoyedThresholdKey,
|
|
1525
|
+
@"action": NSStringFromSelector(@selector(setPetInteractionAnnoyedThreshold:)),
|
|
1526
|
+
@"values": @[@10, @12, @15], @"suffix": @" 次"},
|
|
1527
|
+
@{@"title": @"连击间隔", @"key": PetInteractionIntervalKey,
|
|
1528
|
+
@"action": NSStringFromSelector(@selector(setPetInteractionInterval:)),
|
|
1529
|
+
@"values": @[@0.8, @1.2, @1.8], @"suffix": @" 秒"},
|
|
1530
|
+
];
|
|
1531
|
+
for (NSDictionary *group in interactionGroups) {
|
|
1532
|
+
NSMenuItem *groupItem = [interactionMenu addItemWithTitle:group[@"title"]
|
|
1533
|
+
action:nil keyEquivalent:@""];
|
|
1534
|
+
NSMenu *options = [NSMenu new];
|
|
1535
|
+
NSNumber *current = [NSUserDefaults.standardUserDefaults objectForKey:group[@"key"]];
|
|
1536
|
+
for (NSNumber *value in group[@"values"]) {
|
|
1537
|
+
NSString *number = value.doubleValue == value.integerValue ?
|
|
1538
|
+
[NSString stringWithFormat:@"%ld", (long)value.integerValue] :
|
|
1539
|
+
[NSString stringWithFormat:@"%.1f", value.doubleValue];
|
|
1540
|
+
NSMenuItem *option = [options addItemWithTitle:
|
|
1541
|
+
[number stringByAppendingString:group[@"suffix"]]
|
|
1542
|
+
action:NSSelectorFromString(group[@"action"]) keyEquivalent:@""];
|
|
1543
|
+
option.target = NSApp.delegate;
|
|
1544
|
+
option.representedObject = value;
|
|
1545
|
+
option.state = fabs(current.doubleValue - value.doubleValue) < 0.001 ?
|
|
1546
|
+
NSControlStateValueOn : NSControlStateValueOff;
|
|
1547
|
+
}
|
|
1548
|
+
groupItem.submenu = options;
|
|
1549
|
+
}
|
|
1550
|
+
[interactionMenu addItem:NSMenuItem.separatorItem];
|
|
1551
|
+
NSMenuItem *editInteractionPhrases = [interactionMenu addItemWithTitle:@"编辑互动配文…"
|
|
1552
|
+
action:@selector(editPhrasesFile:) keyEquivalent:@""];
|
|
1553
|
+
editInteractionPhrases.target = NSApp.delegate;
|
|
1554
|
+
interactionItem.submenu = interactionMenu;
|
|
1423
1555
|
NSMenuItem *systemStatusItem = [menu addItemWithTitle:@"系统状态" action:nil keyEquivalent:@""];
|
|
1424
1556
|
NSMenu *systemStatusMenu = [NSMenu new];
|
|
1425
1557
|
NSArray<NSDictionary *> *systemStatusOptions = @[
|