kipphi 2.1.4-beta.1 → 2.1.4

package/env.ts

@@ -13,7 +13,7 @@
 
 
 // 就挺神奇的！明明typeof后面跟值，这里却可以写成类型导入
-import { type TimeT, type EventValueType } from "./chartTypes";
+import { type TimeT, type EventValueType, EventValueESType } from "./chartTypes";
 import { EventNode } from "./event";
 import { toTimeString } from "./util";
 
@@ -206,16 +206,23 @@ interface _Error extends _CheckMap {
     error: "";
 }
 
+type GetEnumKey<TEnum extends Record<string, any>, TValue extends TEnum[keyof TEnum]> = {
+  [K in keyof TEnum]: TEnum[K] extends TValue ? K : never
+}[keyof TEnum];
 
-interface ErrorMap extends Record<keyof typeof ERROR_IDS, Array<any>>{
-    EVENT_NODE_NOT_DENSE: [EventNode];
+type ERROR_NAMES = keyof typeof ERROR_IDS;
+
+interface ErrorMap extends Record<ERROR_NAMES, Array<any>>{
+    EVENT_NODE_NOT_DENSE: [EventNode<EventValueESType>];
+    EVENT_NODE_TIME_NOT_INCREMENTAL: [EventNode<EventValueESType>];
+    
 }
 
-type ArgsOf<ET extends ERROR_IDS> = ET extends keyof ErrorMap ? ErrorMap[ET] : never;
+type ArgsOf<ET extends ERROR_IDS> = GetEnumKey<typeof ERROR_IDS, ET> extends keyof ErrorMap ? ErrorMap[GetEnumKey<typeof ERROR_IDS, ET>] : [];
 
 export class KPAError<ET extends ERROR_IDS> extends Error {
     fixed = false;
-    args: ArgsOf<ET> | [];
+    args: ArgsOf<ET>;
     constructor(message: string, public id: ET) {
         super(message);
     }
@@ -224,16 +231,16 @@ export class KPAError<ET extends ERROR_IDS> extends Error {
      * 
      * 此时可以调用该方法，该方法会输出错误并把它保存到KPAError的一个`buffer`静态属性下。
      */
-    warn(...args: ArgsOf<ET> | []) {
+    warn(...args: ArgsOf<ET>) {
         console.warn(this.stack);
         this.args = args;
-        KPAError.buffer.push(this);
+        KPAError.buffer.push(this as any);
     }
-    fix(...args: ArgsOf<ET> | []) {
+    fix(...args: ArgsOf<ET>) {
         console.warn("[Auto Fixed]" + this.stack);
         this.fixed = true;
         this.args = args;
-        KPAError.buffer.push(this);
+        KPAError.buffer.push(this as any);
     }
     static buffer: KPAError<ERROR_IDS>[] = [];
     static flush() {
@@ -241,9 +248,10 @@ export class KPAError<ET extends ERROR_IDS> extends Error {
     }
 }
 
+
 export const err = new Proxy(ERRORS, {
     get(target, name) {
-        return (...args: any[]) => new KPAError(target[name](...args) + `(KP${ERROR_IDS[name].toString(16)})`, ERROR_IDS[name]);
+        return (...args: any[]) => new KPAError<typeof ERROR_IDS[keyof typeof ERROR_IDS]>(target[name](...args) + `(KP${ERROR_IDS[name].toString(16)})`, ERROR_IDS[name]);
     }
 }) as unknown as { [key in keyof typeof ERRORS]: (...args: Parameters<typeof ERRORS[key]>) => KPAError<typeof ERROR_IDS[key]>};
 

package/event.ts

@@ -541,16 +541,16 @@ export class EventNodeSequence<VT extends EventValueESType = number> { // 泛型
         // 读取事件列表
         for (let index = 0; index < length; index++) {
             const event = data[index];
+            const [start, end] = (type === EventType.text
+                                ? EventNode.fromTextEvent(event as EventDataRPELike<string>, templates)
+                                : EventNode.fromEvent(event as EventDataRPELike<number | RGB>, chart)) as unknown as [EventStartNode<VT>, EventEndNode<VT>];
             if (TC.lt(event.startTime, lastEndTime)) { // event.startTime < lastEndTime
-                err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${pos}.events[${index}] and the previous`).warn()
+                err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${pos}.events[${index}] and the previous`).warn(start)
             }
             if (!TC.lt(event.startTime, event.endTime)) {
-                err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${pos}.events[${index}]`).warn()
+                err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${pos}.events[${index}]`).warn(start)
             }
             lastEndTime = event.endTime;
-            const [start, end] = (type === EventType.text
-                                ? EventNode.fromTextEvent(event as EventDataRPELike<string>, templates)
-                                : EventNode.fromEvent(event as EventDataRPELike<number | RGB>, chart)) as unknown as [EventStartNode<VT>, EventEndNode<VT>];
             // 刚开始时，上个节点是头
             if (lastEnd.type === NodeType.HEAD) {
                 EventNode.connect(lastEnd, start)
@@ -650,21 +650,21 @@ export class EventNodeSequence<VT extends EventValueESType = number> { // 泛型
             // 从前面复制了，复用性减一
             // KPA2没有更改RPE的按事件存储的机制。
             if (TC.lt(event.startTime, lastEndTime)) { // event.startTime < lastEndTime
-                err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${pos}.events[${index}] and the previous`).warn()
+                err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${pos}.events[${index}] and the previous`).warn(start)
             }
             if (!TC.lt(event.startTime, event.endTime)) {
                 if (TC.eq(event.startTime, event.endTime)) {
                     // 零长事件直接忽略，并认为已经修复
-                    err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${pos}.events[${index}]`).fix();
+                    err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${pos}.events[${index}]`).fix(start);
                     continue;
                 } else {
-                    err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${pos}.events[${index}]`).warn()
+                    err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${pos}.events[${index}]`).warn(start)
                 }
             }
             if (lastEnd.type === NodeType.HEAD) {
                 EventNode.connect(lastEnd, start)
             } else if (TC.gt(event.startTime, lastEndTime)) {
-                err.EVENT_NODE_NOT_DENSE(`${pos}.events[${index}]`).warn();
+                err.EVENT_NODE_NOT_DENSE(`${pos}.events[${index}]`).warn(start);
                 const mid = new EventStartNode(lastEndTime, start.value);
                 const midEnd = new EventEndNode(event.startTime, end.value);
                 EventNode.connect(lastEnd, mid);
@@ -954,7 +954,7 @@ export class EventNodeSequence<VT extends EventValueESType = number> { // 泛型
     checkErrors() {
         let currentNode: EventStartNode<VT> = this.head.next;
         if (TC.ne(currentNode.time, [0, 0, 1])) {
-            err.EVENT_NODE_NOT_DENSE(`${this.id}, ${currentNode.time}`).fix();
+            err.EVENT_NODE_NOT_DENSE(`${this.id}, ${currentNode.time}`).fix(currentNode);
             currentNode.time = [0, 0, 1];
         }
         const endNode = currentNode.next;
@@ -983,10 +983,10 @@ export class EventNodeSequence<VT extends EventValueESType = number> { // 泛型
                 break;
             }
             if (!TC.gt(endNode.time, currentNode.time)) {
-                err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${this.id}, ${currentNode.time}`).warn();
+                err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${this.id}, ${currentNode.time}`).warn(currentNode);
             }
             if (TC.ne(lastEnd.time, currentNode.time)) {
-                err.EVENT_NODE_NOT_DENSE(`${this.id}, ${currentNode.time}`).warn();
+                err.EVENT_NODE_NOT_DENSE(`${this.id}, ${currentNode.time}`).warn(currentNode);
             }
             currentNode = currentNode.next.next;
             lastEnd = endNode;

package/index.d.ts

@@ -2120,7 +2120,7 @@ declare module "event" {
     };
 }
 declare module "env" {
-    import { type TimeT, type EventValueType } from "chartTypes";
+    import { type TimeT, type EventValueType, EventValueESType } from "chartTypes";
     import { EventNode } from "event";
     export enum ERROR_IDS {
         UI_OCCUPIED = 272,
@@ -2200,22 +2200,27 @@ declare module "env" {
         TEMPLATE_EASING_CIRCULAR_REFERENCE: (temEasName: string) => string;
         EASING_DELTA_CANNOT_BE_ZERO: (seqName: string, time: TimeT) => string;
     };
-    interface ErrorMap extends Record<keyof typeof ERROR_IDS, Array<any>> {
-        EVENT_NODE_NOT_DENSE: [EventNode];
-    }
-    type ArgsOf<ET extends ERROR_IDS> = ET extends keyof ErrorMap ? ErrorMap[ET] : never;
+    type GetEnumKey<TEnum extends Record<string, any>, TValue extends TEnum[keyof TEnum]> = {
+        [K in keyof TEnum]: TEnum[K] extends TValue ? K : never;
+    }[keyof TEnum];
+    type ERROR_NAMES = keyof typeof ERROR_IDS;
+    interface ErrorMap extends Record<ERROR_NAMES, Array<any>> {
+        EVENT_NODE_NOT_DENSE: [EventNode<EventValueESType>];
+        EVENT_NODE_TIME_NOT_INCREMENTAL: [EventNode<EventValueESType>];
+    }
+    type ArgsOf<ET extends ERROR_IDS> = GetEnumKey<typeof ERROR_IDS, ET> extends keyof ErrorMap ? ErrorMap[GetEnumKey<typeof ERROR_IDS, ET>] : [];
     export class KPAError<ET extends ERROR_IDS> extends Error {
         id: ET;
         fixed: boolean;
-        args: ArgsOf<ET> | [];
+        args: ArgsOf<ET>;
         constructor(message: string, id: ET);
         /**
          * 对于解析谱面等场景，有时可能需要找出全部的错误，不宜直接抛出错误中断代码执行
          *
          * 此时可以调用该方法，该方法会输出错误并把它保存到KPAError的一个`buffer`静态属性下。
          */
-        warn(...args: ArgsOf<ET> | []): void;
-        fix(...args: ArgsOf<ET> | []): void;
+        warn(...args: ArgsOf<ET>): void;
+        fix(...args: ArgsOf<ET>): void;
         static buffer: KPAError<ERROR_IDS>[];
         static flush(): void;
     }
@@ -2972,7 +2977,7 @@ declare module "rpeChartCompiler" {
         deletesEmptyLines: boolean;
         constructor(chart: Chart);
         compileChart(): ChartDataRPE;
-        compileJudgeLine(judgeLine: JudgeLine): JudgeLineDataRPE;
+        compileJudgeLine(judgeLine: JudgeLine, lines: JudgeLine[]): JudgeLineDataRPE;
         compileEasedEvent<VT extends EventValueESType>(snode: EventStartNode<VT> & {
             evaluator: EasedEvaluatorOfType<VT>;
         }, getValue: (node: EventStartNode<VT> | EventEndNode<VT>) => VT): EventDataRPELike<VT>;
@@ -2994,6 +2999,7 @@ declare module "rpeChartCompiler" {
          * @returns
          */
         substitute<VT extends EventValueESType>(seq: EventNodeSequence<VT>): EventNodeSequence<VT>;
+        static replaceFilename(filename: string): string;
     }
 }
 declare module "index" {

package/index.js

@@ -1782,14 +1782,14 @@ class EventNodeSequence {
     let lastEndTime = [0, 0, 1];
     for (let index = 0;index < length; index++) {
       const event = data[index];
+      const [start, end] = type === 9 /* text */ ? EventNode.fromTextEvent(event, templates) : EventNode.fromEvent(event, chart);
       if (TC2.lt(event.startTime, lastEndTime)) {
-        err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${pos}.events[${index}] and the previous`).warn();
+        err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${pos}.events[${index}] and the previous`).warn(start);
       }
       if (!TC2.lt(event.startTime, event.endTime)) {
-        err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${pos}.events[${index}]`).warn();
+        err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${pos}.events[${index}]`).warn(start);
       }
       lastEndTime = event.endTime;
-      const [start, end] = type === 9 /* text */ ? EventNode.fromTextEvent(event, templates) : EventNode.fromEvent(event, chart);
       if (lastEnd.type === 0 /* HEAD */) {
         EventNode.connect(lastEnd, start);
       } else if (lastEnd.value === lastEnd.previous.value && lastEnd.previous.evaluator instanceof EasedEvaluator) {
@@ -1844,20 +1844,20 @@ class EventNodeSequence {
         chart.segmentedTemplates.set(evaluator.easing, [pos, start.time]);
       }
       if (TC2.lt(event.startTime, lastEndTime)) {
-        err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${pos}.events[${index}] and the previous`).warn();
+        err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${pos}.events[${index}] and the previous`).warn(start);
       }
       if (!TC2.lt(event.startTime, event.endTime)) {
         if (TC2.eq(event.startTime, event.endTime)) {
-          err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${pos}.events[${index}]`).fix();
+          err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${pos}.events[${index}]`).fix(start);
           continue;
         } else {
-          err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${pos}.events[${index}]`).warn();
+          err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${pos}.events[${index}]`).warn(start);
         }
       }
       if (lastEnd.type === 0 /* HEAD */) {
         EventNode.connect(lastEnd, start);
       } else if (TC2.gt(event.startTime, lastEndTime)) {
-        err.EVENT_NODE_NOT_DENSE(`${pos}.events[${index}]`).warn();
+        err.EVENT_NODE_NOT_DENSE(`${pos}.events[${index}]`).warn(start);
         const mid = new EventStartNode(lastEndTime, start.value);
         const midEnd = new EventEndNode(event.startTime, end.value);
         EventNode.connect(lastEnd, mid);
@@ -2075,7 +2075,7 @@ class EventNodeSequence {
   checkErrors() {
     let currentNode = this.head.next;
     if (TC2.ne(currentNode.time, [0, 0, 1])) {
-      err.EVENT_NODE_NOT_DENSE(`${this.id}, ${currentNode.time}`).fix();
+      err.EVENT_NODE_NOT_DENSE(`${this.id}, ${currentNode.time}`).fix(currentNode);
       currentNode.time = [0, 0, 1];
     }
     const endNode = currentNode.next;
@@ -2103,10 +2103,10 @@ class EventNodeSequence {
         break;
       }
       if (!TC2.gt(endNode2.time, currentNode.time)) {
-        err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${this.id}, ${currentNode.time}`).warn();
+        err.EVENT_NODE_TIME_NOT_INCREMENTAL(`${this.id}, ${currentNode.time}`).warn(currentNode);
       }
       if (TC2.ne(lastEnd.time, currentNode.time)) {
-        err.EVENT_NODE_NOT_DENSE(`${this.id}, ${currentNode.time}`).warn();
+        err.EVENT_NODE_NOT_DENSE(`${this.id}, ${currentNode.time}`).warn(currentNode);
       }
       currentNode = currentNode.next.next;
       lastEnd = endNode2;
@@ -5454,17 +5454,18 @@ class RPEChartCompiler {
           node = endNode.next;
         }
         return true;
-      });
+      }) || line2.children.size > 0;
     } : () => true;
-    const judgeLineList = chart2.judgeLines.filter(filter).map((line2) => this.compileJudgeLine(line2));
+    const judgeLineList = chart2.judgeLines.filter(filter);
+    const judgeLineDataList = judgeLineList.map((line2) => this.compileJudgeLine(line2, judgeLineList));
     const BPMList = chart2.timeCalculator.dump();
     const META = {
-      RPEVersion: 1,
+      RPEVersion: 170,
       background: "illustration.png",
       charter: chart2.charter,
       composer: chart2.composer,
       illustration: chart2.illustrator,
-      id: Math.random().toString().slice(2, 10),
+      id: Math.random().toString().slice(2, 18),
       level: chart2.level,
       name: chart2.name,
       offset: chart2.offset,
@@ -5475,9 +5476,9 @@ class RPEChartCompiler {
       if (!target) {
         continue;
       }
-      const lineData = judgeLineList[target.id];
+      const lineData = judgeLineDataList[judgeLineList.indexOf(target)];
       if (lineData.attachUI) {
-        judgeLineList.push({
+        judgeLineDataList.push({
           Group: 0,
           Name: "Auto created for " + uiName,
           Texture: "line.png",
@@ -5485,7 +5486,7 @@ class RPEChartCompiler {
           notes: [],
           bpmfactor: 1,
           eventLayers: [],
-          father: target.id,
+          father: judgeLineList.indexOf(target),
           isCover: lineData.isCover,
           numOfNotes: 0,
           anchor: target.anchor,
@@ -5498,7 +5499,7 @@ class RPEChartCompiler {
     return {
       BPMList,
       META,
-      judgeLineList,
+      judgeLineList: judgeLineDataList,
       judgeLineGroup: judgeLineGroups,
       multiLineString: "",
       multiScale: 1,
@@ -5506,14 +5507,15 @@ class RPEChartCompiler {
       kpaChartTime: chart2.chartingSeconds
     };
   }
-  compileJudgeLine(judgeLine) {
+  compileJudgeLine(judgeLine, lines) {
     const chart2 = this.chart;
     const notes = this.compileNNLists([...judgeLine.nnLists.values()], [...judgeLine.hnLists.values()]);
+    const father = judgeLine.father ? lines.indexOf(judgeLine.father) : -1;
     return {
       notes,
       Group: chart2.judgeLineGroups.indexOf(judgeLine.group),
       Name: judgeLine.name,
-      Texture: judgeLine.texture,
+      Texture: RPEChartCompiler.replaceFilename(judgeLine.texture),
       bpmfactor: 1,
       eventLayers: judgeLine.eventLayers.map((layer, index) => ({
         moveXEvents: layer.moveX ? this.dumpEventNodeSequence(layer.moveX) : undefined,
@@ -5528,7 +5530,7 @@ class RPEChartCompiler {
         textEvents: judgeLine.extendedLayer.text ? this.dumpEventNodeSequence(judgeLine.extendedLayer.text) : undefined,
         colorEvents: judgeLine.extendedLayer.color ? this.dumpEventNodeSequence(judgeLine.extendedLayer.color) : undefined
       },
-      father: judgeLine.father?.id ?? -1,
+      father,
       isCover: judgeLine.cover ? 1 : 0,
       numOfNotes: notes.length,
       anchor: judgeLine.anchor,
@@ -5802,6 +5804,17 @@ class RPEChartCompiler {
     EventNode.connect(lastStart, newSeq.tail);
     return newSeq;
   }
+  static replaceFilename(filename) {
+    const arr = [];
+    for (const char of filename) {
+      if (char.charCodeAt(0) >= 128) {
+        arr.push(`u(${char.charCodeAt(0).toString(16)})`);
+      } else {
+        arr.push(char);
+      }
+    }
+    return arr.join("");
+  }
 }
 export {
   toTimeString,

package/note.ts

@@ -459,7 +459,7 @@ export class NNList {
 
             return newNode
         } else {
-            return node;
+            return node as NoteNode;
         }
     }
     dumpKPA(): NNListDataKPA {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "kipphi",
     "description": "Parse your Phigros Chart(.rpe.json or .kpa.json) into an editor-friendly format.",
-    "version": "2.1.4-beta.1",
+    "version": "2.1.4",
     "author": "Team Zincs (https://github.com/TeamZincs)",
     "license": "MIT",
     "repository": {

package/rpeChartCompiler.ts

@@ -65,18 +65,20 @@ export class RPEChartCompiler {
                     }
                     return true; // 有超过两个的节点
                 })
+                || line.children.size > 0;
         } : () => true
         const judgeLineList = chart.judgeLines
-            .filter(filter)
-            .map(line => this.compileJudgeLine(line));
+            .filter(filter);
+        const judgeLineDataList = judgeLineList
+            .map(line => this.compileJudgeLine(line, judgeLineList));
         const BPMList = chart.timeCalculator.dump();
         const META: MetaData = {
-            RPEVersion: 1,
+            RPEVersion: 170,
             background: 'illustration.png',
             charter: chart.charter,
             composer: chart.composer,
             illustration: chart.illustrator,
-            id: Math.random().toString().slice(2, 10),
+            id: Math.random().toString().slice(2, 18),
             level: chart.level,
             name: chart.name,
             offset: chart.offset,
@@ -88,11 +90,11 @@ export class RPEChartCompiler {
             if (!target) {
                 continue;
             }
-            const lineData = judgeLineList[target.id];
+            const lineData = judgeLineDataList[judgeLineList.indexOf(target)];
             // RPEJSON里面一条线只能绑一个UI，KPAJSON可以绑多个
             // 所以如果绑了多个，自动给它们创建子线
             if (lineData.attachUI) {
-                judgeLineList.push({
+                judgeLineDataList.push({
                     Group: 0,
                     Name: "Auto created for " + uiName,
                     Texture: "line.png",
@@ -100,7 +102,7 @@ export class RPEChartCompiler {
                     notes: [],
                     bpmfactor: 1.0,
                     eventLayers: [],
-                    father: target.id,
+                    father: judgeLineList.indexOf(target),
                     isCover: lineData.isCover,
                     numOfNotes: 0,
                     anchor: target.anchor,
@@ -116,7 +118,7 @@ export class RPEChartCompiler {
         return {
             BPMList,
             META,
-            judgeLineList,
+            judgeLineList: judgeLineDataList,
             judgeLineGroup: judgeLineGroups,
             multiLineString: '',
             multiScale: 1.0,
@@ -125,15 +127,17 @@ export class RPEChartCompiler {
         };
     }
 
-    compileJudgeLine(judgeLine: JudgeLine): JudgeLineDataRPE {
+    compileJudgeLine(judgeLine: JudgeLine, lines: JudgeLine[]): JudgeLineDataRPE {
         const chart = this.chart;
         const notes = this.compileNNLists([...judgeLine.nnLists.values()], [...judgeLine.hnLists.values()]);
 
+        const father = judgeLine.father ? lines.indexOf(judgeLine.father) : -1;
+
         return {
             notes: notes,
             Group: chart.judgeLineGroups.indexOf(judgeLine.group),
             Name: judgeLine.name,
-            Texture: judgeLine.texture,
+            Texture: RPEChartCompiler.replaceFilename(judgeLine.texture),
             bpmfactor: 1.0,
             eventLayers: judgeLine.eventLayers.map((layer, index): EventLayerDataRPE => ({
                 moveXEvents: layer.moveX ? this.dumpEventNodeSequence(layer.moveX) : undefined,
@@ -148,7 +152,7 @@ export class RPEChartCompiler {
                 textEvents: judgeLine.extendedLayer.text ? this.dumpEventNodeSequence(judgeLine.extendedLayer.text) : undefined,
                 colorEvents: judgeLine.extendedLayer.color ? this.dumpEventNodeSequence(judgeLine.extendedLayer.color) : undefined
             },
-            father: judgeLine.father?.id ?? -1,
+            father: father,
             isCover: judgeLine.cover ? 1 : 0,
             numOfNotes: notes.length,
             anchor: judgeLine.anchor,
@@ -521,6 +525,18 @@ export class RPEChartCompiler {
         EventNode.connect(lastStart, newSeq.tail)
         return newSeq;
     }
+
+    static replaceFilename(filename: string) {
+        const arr = [];
+        for (const char of filename) {
+            if (char.charCodeAt(0) >= 128) {
+                arr.push(`u(${char.charCodeAt(0).toString(16)})`);
+            } else {
+                arr.push(char);
+            }
+        }
+        return arr.join("");
+    }
 }
 // 现在是2025年10月18日，杨哲思已经改掉了此项目最史山的代码之一，但是还是一坨