mirror of
https://github.com/LLOneBot/LLOneBot.git
synced 2024-11-22 01:56:33 +00:00
fix: face msg faceType
This commit is contained in:
parent
b5e578733f
commit
f8890b309b
@ -1,10 +1,10 @@
|
||||
{
|
||||
"manifest_version": 4,
|
||||
"type": "extension",
|
||||
"name": "LLOneBot v3.22.0",
|
||||
"name": "LLOneBot v3.22.1",
|
||||
"slug": "LLOneBot",
|
||||
"description": "使你的NTQQ支持OneBot11协议进行QQ机器人开发, 不支持商店在线更新",
|
||||
"version": "3.22.0",
|
||||
"version": "3.22.1",
|
||||
"icon": "./icon.jpg",
|
||||
"authors": [
|
||||
{
|
||||
|
@ -1,6 +1,6 @@
|
||||
import {
|
||||
AtType,
|
||||
ElementType,
|
||||
ElementType, FaceIndex,
|
||||
FaceType,
|
||||
PicType,
|
||||
SendArkElement,
|
||||
@ -249,12 +249,13 @@ export class SendMsgElementConstructor {
|
||||
}
|
||||
|
||||
static face(faceId: number): SendFaceElement {
|
||||
faceId = parseInt(faceId.toString());
|
||||
return {
|
||||
elementType: ElementType.FACE,
|
||||
elementId: "",
|
||||
faceElement: {
|
||||
faceIndex: faceId,
|
||||
faceType: FaceType.normal
|
||||
faceType: faceId < 222 ? FaceType.normal : FaceType.normal2,
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -268,7 +269,7 @@ export class SendMsgElementConstructor {
|
||||
elementType: ElementType.FACE,
|
||||
elementId: "",
|
||||
faceElement: {
|
||||
faceIndex: 358,
|
||||
faceIndex: FaceIndex.dice,
|
||||
faceType: FaceType.dice,
|
||||
"faceText": "[骰子]",
|
||||
"packId": "1",
|
||||
@ -290,7 +291,7 @@ export class SendMsgElementConstructor {
|
||||
elementType: ElementType.FACE,
|
||||
elementId: "",
|
||||
faceElement: {
|
||||
"faceIndex": 359,
|
||||
"faceIndex": FaceIndex.RPS,
|
||||
"faceText": "[包剪锤]",
|
||||
"faceType": 3,
|
||||
"packId": "1",
|
||||
|
@ -214,9 +214,15 @@ export interface GrayTipElement {
|
||||
|
||||
export enum FaceType {
|
||||
normal=1, // 小黄脸
|
||||
normal2=2, // 新小黄脸, 从faceIndex 222开始?
|
||||
dice=3 // 骰子
|
||||
}
|
||||
|
||||
export enum FaceIndex {
|
||||
dice = 358,
|
||||
RPS = 359 // 石头剪刀布
|
||||
}
|
||||
|
||||
export interface FaceElement {
|
||||
faceIndex: number,
|
||||
faceType: FaceType,
|
||||
|
@ -10,7 +10,7 @@ import {
|
||||
} from "./types";
|
||||
import {
|
||||
AtType,
|
||||
ChatType,
|
||||
ChatType, FaceIndex,
|
||||
GrayTipElementSubType,
|
||||
Group,
|
||||
GroupMember,
|
||||
@ -227,8 +227,19 @@ export class OB11Constructor {
|
||||
message_data["type"] = OB11MessageDataType.json;
|
||||
message_data["data"]["data"] = element.arkElement.bytesData;
|
||||
} else if (element.faceElement) {
|
||||
message_data["type"] = OB11MessageDataType.face;
|
||||
message_data["data"]["id"] = element.faceElement.faceIndex.toString();
|
||||
const faceId = element.faceElement.faceIndex;
|
||||
if (faceId === FaceIndex.dice){
|
||||
message_data["type"] = OB11MessageDataType.dice
|
||||
message_data["data"]["result"] = element.faceElement.resultId;
|
||||
}
|
||||
else if (faceId === FaceIndex.RPS){
|
||||
message_data["type"] = OB11MessageDataType.RPS
|
||||
message_data["data"]["result"] = element.faceElement.resultId;
|
||||
}
|
||||
else{
|
||||
message_data["type"] = OB11MessageDataType.face;
|
||||
message_data["data"]["id"] = element.faceElement.faceIndex.toString();
|
||||
}
|
||||
} else if (element.marketFaceElement) {
|
||||
message_data["type"] = OB11MessageDataType.mface;
|
||||
message_data["data"]["text"] = element.marketFaceElement.faceName;
|
||||
|
@ -1 +1 @@
|
||||
export const version = "3.22.0"
|
||||
export const version = "3.22.1"
|
Loading…
x
Reference in New Issue
Block a user