@shijiu/jsview-vue 2.1.200 → 2.1.339-test.0

package/utils/JsViewVueWidget/JsvFreeMoveActor/SetAction.ts

@@ -11,6 +11,7 @@ import { GroupType_ActionAssoc } from "./ForgeTypeDefine"
 import CallbackManager from "./CallbackManager";
 import ActionRefObject from "./ActionRefObject";
 import ActorState from "./ActorState";
+import { NexusNode } from "./NexusNode";
 
 const ConditionCmdCreator = (
   builderThis: ActorPackBuilder,
@@ -46,15 +47,15 @@ const ConditionCmdCreator = (
   return StateCmdBuilder.NewCondition(conditionSet);
 }
 
-const ActOnActEvent = (
+const ActOnNexusEvent = (
   builderThis: ActorPackBuilder,
-  jsRefToken: number,
+  nexusId: number,
   eventType: number,
   acts: Array<Object> | null,
   isFinal: boolean,
   callback: Function): Object => {
   return ConditionCmdCreator(builderThis, (commonInfo: Object) => {
-    return ConditionSetBuilder.OnActEvent(jsRefToken, eventType, commonInfo);
+    return ConditionSetBuilder.OnNexusEvent(nexusId, eventType, commonInfo);
   }, acts, isFinal, callback)
 }
 
@@ -103,10 +104,11 @@ class ActorPackBuilder {
 
   private _SpeedKeeps: number;
   private _AccKeeps: number;
-  private _RefObj: ActionRefObject | null;
+  private _NexusRecv: NexusNode | null;
   private _CommonInfoValid: boolean;
+  private _ContorlSlefNexus: NexusNode;
 
-  constructor(callbackManager: CallbackManager) {
+  constructor(callbackManager: CallbackManager, selfNexus: NexusNode) {
     this._CallbackManager = callbackManager;
 
     this._ActionTokenGen = 1; // 自累加的token分发器, 预留0作为无效值判断
@@ -114,35 +116,27 @@ class ActorPackBuilder {
     // 下一个Act指令时所保留的状态
     this._SpeedKeeps = 0;
     this._AccKeeps = 0;
-    this._RefObj = null;
+    this._NexusRecv = null;
     this._CommonInfoValid = false;
+    this._ContorlSlefNexus = selfNexus;
+  }
+
+  isInUsing() {
+    return this._CommonInfoValid;
   }
 
   public updateCommonInfo(
     xySpdEnables: number,
     xyAccEnables: number,
-    actRefObj: ActionRefObject | null
+    nexusRecv: NexusNode | null
   ) {
     this._SpeedKeeps = xySpdEnables;
     this._AccKeeps = xyAccEnables;
-    this._RefObj = actRefObj;
-
-    // 如果有refobj,则分发token
-    this._InitActRefObj(this._RefObj);
+    this._NexusRecv = nexusRecv;
 
     this._CommonInfoValid = true;
   }
 
-  private _InitActRefObj(refObj: ActionRefObject | null) {
-    if (refObj) {
-      if (refObj.used) {
-        console.warn("Warn: actRef be overrided, old token=" + refObj.token);
-      }
-      refObj.token = this._ActionTokenGen++;
-      refObj.used = false;
-    }
-  }
-
   private _CheckCommonInfo(): boolean {
     if (!this._CommonInfoValid) {
       console.error("Error: must call from new action()");
@@ -190,20 +184,20 @@ class ActorPackBuilder {
   }
 
   /**
-   * moveTo 以给定速度移动到目标位置
+   * moveTo 以给定速度移动, 知道边界满足
    * 
-   * @param {int} targetX 带符号整数，标识运动的目标位置，相对于Actor当前位置, 如果设置为undefined, 则表示该轴不设目标
-   * @param {int} targetY 带符号整数，标识运动的目标位置，相对于Actor当前位置, 如果设置为undefined, 则表示该轴不设目标
+   * @param {int} edgeX 带符号整数，标识运动的边界位置，相对于Actor原始位置, 如果设置为undefined, 则表示该轴不设目标
+   * @param {int} edgeY 带符号整数，标识运动的边界位置，相对于Actor原始位置, 如果设置为undefined, 则表示该轴不设目标
    * @param {double} xSpeed 运行速度，使用时会自动取绝对值，单位(pixel/帧), 
-   *                       undefined时，若targetX设置, 则以另一轴速度反推此速度, 否则不改变该轴速度
+   *                       undefined时，若edgeX设置, 则把edge作为运动目标，以另一轴速度反推此速度, 否则不改变该轴速度
    * @param {double} ySpeed 运行速度，使用时会自动取绝对值，单位(pixel/帧)
-   *                       undefined时，若targetY设置, 则以另一轴速度反推此速度, 否则不改变该轴速度
+   *                       undefined时，若targetY设置, 则把edge作为运动目标，以另一轴速度反推此速度, 否则不改变该轴速度
    * @param {function} endCallback 参数(x, y) 运动到目标位置后的回调函数, x或者y达到后即回调，以先到为准，回报当前Actor的相对于原始位置的x,y
    * @return CommandPack(放入run或者then的CmdPackList队列)
    */
   public moveTo(
-    targetX: number | undefined,
-    targetY: number | undefined,
+    edgeX: number | undefined,
+    edgeY: number | undefined,
     xSpeed: number | undefined,
     ySpeed: number | undefined,
     endCallback: Function | null = null
@@ -225,15 +219,15 @@ class ActorPackBuilder {
     let cmdList: Array<Object> = [];
 
     // 设置运动速度
-    cmdList.push(ActionCmdBuilder.SetArrowSpeed(targetX, targetY, xSpeed, ySpeed));
+    cmdList.push(ActionCmdBuilder.SetArrowSpeed(edgeX, edgeY, xSpeed, ySpeed));
 
     // 设置达到目标位置的condition
     cmdList.push(
       ActOnReachPosition(
         this,
-        targetX, targetY,
+        edgeX, edgeY,
         [ActionCmdBuilder.StopMovingExact(),
-        this._RefObj ? StateCmdBuilder.FireActEvent(ActEventDefine.ActFinish, this._RefObj.token) : null
+        this._NexusRecv ? StateCmdBuilder.FireNexusEvent(ActEventDefine.ActFinish, this._NexusRecv.token) : null
         ],
         true,
         endCallback ? (actorState: ActorState) => {
@@ -244,7 +238,7 @@ class ActorPackBuilder {
 
     //return CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, cmdList);
 
-    let c = CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, this._RefObj?.token, cmdList);
+    let c = CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, this._NexusRecv?.token, cmdList);
     return c;
   }
 
@@ -276,7 +270,7 @@ class ActorPackBuilder {
     if (isNaN(spreadFrame as number) || spreadFrame == 0) {
       // 经历的帧数为0, 即为立即变速
       cmdList.push(ActionCmdBuilder.SetSpeed(xSpeed, ySpeed));
-      return CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, this._RefObj?.token, cmdList);
+      return CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, this._NexusRecv?.token, cmdList);
     } else {
       // 均匀变速逻辑
       cmdList.push(ActionCmdBuilder.AltSpeed(xSpeed, ySpeed, spreadFrame));
@@ -287,7 +281,7 @@ class ActorPackBuilder {
           this,
           xSpeed, ySpeed,
           [ActionCmdBuilder.ResetAcc(0, 0),
-          this._RefObj ? StateCmdBuilder.FireActEvent(ActEventDefine.ActFinish, this._RefObj.token) : null
+          this._NexusRecv ? StateCmdBuilder.FireNexusEvent(ActEventDefine.ActFinish, this._NexusRecv.token) : null
           ],
           true, // isFinal
           finishCallback ? (actorState: ActorState) => {
@@ -296,7 +290,7 @@ class ActorPackBuilder {
         )
       )
 
-      return CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, this._RefObj?.token, cmdList);
+      return CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, this._NexusRecv?.token, cmdList);
     }
   }
 
@@ -320,11 +314,10 @@ class ActorPackBuilder {
     // 3. 当收到 ActFinish, 回调callback，标识动作完成
     // 特别注意: 存在有可能以当前speed无法到达target的情况，此时由native判断出，
 
-    if (!this._RefObj) {
+    if (!this._NexusRecv) {
       // 此动作的结束由native来判断和决定
       // 要跟踪native的 ActFinish 事件
-      this._RefObj = { token: 0, used: false };
-      this._InitActRefObj(this._RefObj);
+      this._NexusRecv = this._ContorlSlefNexus;
     }
 
     if (!this._BasicPreProcess("brakeToPosition")) {
@@ -343,9 +336,9 @@ class ActorPackBuilder {
 
     // 创建结束ConditionSet(ActFinish)
     cmdList.push(
-      ActOnActEvent(
+      ActOnNexusEvent(
         this,
-        this._RefObj.token,
+        this._NexusRecv.token,
         ActEventDefine.ActFinish,
         null,
         true,
@@ -357,9 +350,9 @@ class ActorPackBuilder {
 
     // 创建结束ConditionSet(ActReject)
     cmdList.push(
-      ActOnActEvent(
+      ActOnNexusEvent(
         this,
-        this._RefObj.token,
+        this._NexusRecv.token,
         ActEventDefine.ActReject,
         null,
         true,
@@ -369,7 +362,7 @@ class ActorPackBuilder {
       )
     );
 
-    return CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, this._RefObj?.token, cmdList);
+    return CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, this._NexusRecv?.token, cmdList);
   }
 
 
@@ -392,7 +385,7 @@ class ActorPackBuilder {
     let cmdList: Array<Object> = [];
     cmdList.push(ActionCmdBuilder.SetSpeed(spdX, spdY));
 
-    return CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, this._RefObj?.token, cmdList);
+    return CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, this._NexusRecv?.token, cmdList);
   }
 
   /*
@@ -422,9 +415,9 @@ class ActorPackBuilder {
     cmdList.push(ActionCmdBuilder.SetAccel(accelX, accelY));
 
     // 创建拐点的condition回调
-    this._BuildAccelOnPole(this, cmdList, this._RefObj, onRevertX, onRevertY);
+    this._BuildAccelOnPole(this, cmdList, this._NexusRecv, onRevertX, onRevertY);
 
-    return CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, this._RefObj?.token, cmdList);
+    return CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, this._NexusRecv?.token, cmdList);
   }
 
   /*
@@ -463,9 +456,9 @@ class ActorPackBuilder {
     cmdList.push(ActionCmdBuilder.SetAccel(accelX, accelY));
 
     // 创建拐点的condition回调
-    this._BuildAccelOnPole(this, cmdList, this._RefObj, onRevertX, onRevertY);
+    this._BuildAccelOnPole(this, cmdList, this._NexusRecv, onRevertX, onRevertY);
 
-    return CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, this._RefObj?.token, cmdList);
+    return CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, this._NexusRecv?.token, cmdList);
   }
 
   /*
@@ -483,17 +476,17 @@ class ActorPackBuilder {
     let cmdList: Array<Object> = [];
     cmdList.push(isExact ? ActionCmdBuilder.StopMovingExact() : ActionCmdBuilder.StopMoving());
 
-    return CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, this._RefObj?.token, cmdList);
+    return CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, this._NexusRecv?.token, cmdList);
   }
 
   _BuildAccelOnPole(
     builderThis: ActorPackBuilder,
     cmdList: Array<Object>,
-    actRefObj: ActionRefObject | null,
+    nexusRecv: NexusNode | null,
     onRevertX: Function | null,
     onRevertY: Function | null
   ) {
-    if (actRefObj || onRevertX || onRevertY) {
+    if (nexusRecv || onRevertX || onRevertY) {
       // RefObj: 外界可能希望了解速度拐点的ActEvent
       // onRevertX || onRevertY: 通过callback希望了解速度拐点信息
 
@@ -502,7 +495,7 @@ class ActorPackBuilder {
         ActOnGetAcrossSpeed(
           builderThis,
           0, undefined,
-          [actRefObj ? StateCmdBuilder.FireActEvent(ActEventDefine.SpeedRevertX, actRefObj.token) : null],
+          [nexusRecv ? StateCmdBuilder.FireNexusEvent(ActEventDefine.SpeedRevertX, nexusRecv.token) : null],
           false, // isFinal
           onRevertX ? () => {
             onRevertX();
@@ -515,7 +508,7 @@ class ActorPackBuilder {
         ActOnGetAcrossSpeed(
           builderThis,
           undefined, 0,
-          [actRefObj ? StateCmdBuilder.FireActEvent(ActEventDefine.SpeedRevertY, actRefObj.token) : null],
+          [nexusRecv ? StateCmdBuilder.FireNexusEvent(ActEventDefine.SpeedRevertY, nexusRecv.token) : null],
           false, // isFinal
           onRevertY ? () => {
             onRevertY();
@@ -531,11 +524,6 @@ class ActorPackBuilder {
       return false;
     }
     this._CommonInfoValid = false;
-
-    if (this._RefObj) {
-      this._RefObj.used = true;
-    }
-
     return true;
   }
 
@@ -545,7 +533,7 @@ class ActorPackBuilder {
     // 传送动作
     cmdList.push(ActionCmdBuilder.TeleportTo(x, y, isOffset));
 
-    let c = CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, this._RefObj?.token, cmdList);
+    let c = CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, this._NexusRecv?.token, cmdList);
     return c;
   }
 }

package/utils/JsViewVueWidget/JsvFreeMoveActor/SetCondition.ts

@@ -8,6 +8,9 @@
 import ActionRefObject from "./ActionRefObject";
 import CallbackManager from "./CallbackManager";
 import { ConditionSetBuilder, StateCmdBuilder, CmdPackBuilder } from "./ForgeTypeDefine"
+import { NexusNode } from "./NexusNode";
+
+type UNumber = undefined | number;
 
 const setChildCommnadPackList = (conditionSet: Object, callbackManager: CallbackManager, cmdPackList: Array<Object>) => {
   for (let i = 0; i < cmdPackList.length; i++) {
@@ -21,19 +24,32 @@ const setChildCommnadPackList = (conditionSet: Object, callbackManager: Callback
   ConditionSetBuilder.SetCmdPackList(conditionSet, cmdPackList);
 }
 
+type WallDirection = "left" | "right" | "top" | "bottom";
+
 class ConditionPackBuilder {
   public _Callbacks: CallbackManager;
   private _CommonInfo: Object;
   private _CommonInfoValid: boolean;
+  private _ContorlSlefNexus: NexusNode;
 
-  constructor(callbackManager) {
+  constructor(callbackManager: CallbackManager, selfNexus: NexusNode) {
     this._Callbacks = callbackManager;
     this._CommonInfo = ConditionSetBuilder.InitCommonInfo();
     this._CommonInfoValid = false;
+    this._ContorlSlefNexus = selfNexus;
+  }
+
+  isInUsing() {
+    return this._CommonInfoValid;
   }
 
-  updateCommandInfo(group: number, multiTimes: boolean, specName: string | null) {
-    ConditionSetBuilder.UpdateCommonInfo(this._CommonInfo, group, multiTimes, specName);
+  updateCommandInfo(
+    group: number,
+    multiTimes: boolean,
+    specName: string | null,
+    shoudRenderBreak: boolean
+  ) {
+    ConditionSetBuilder.UpdateCommonInfo(this._CommonInfo, group, multiTimes, specName, shoudRenderBreak);
     this._CommonInfoValid = true;
   }
 
@@ -55,6 +71,32 @@ class ConditionPackBuilder {
     return this._BuildPack(ConditionSetBuilder.ReachPosition(xPosition, yPosition, this._CommonInfo));
   }
 
+  /**
+   * reachPosition
+   * 获取 ReachPosition 的condition
+   * x或y已经处于，或者被越过时触发
+   * 
+   * @param {double} xPosition 位置有效值，可以传入undefined来决定此值不设置
+   * @param {double} yPosition 位置有效值，可以传入undefined来决定此值不设置
+   */
+  wallPosition(direction: WallDirection, xPosition: UNumber, yPosition: UNumber): object | null {
+    if (!this._CheckCommonInfo()) {
+      return null;
+    }
+    this._CommonInfoValid = false;
+
+    return this._BuildPack(ConditionSetBuilder.WallPosition(direction, xPosition, yPosition, this._CommonInfo));
+  }
+
+  boxPosition(left: UNumber, top: UNumber, right: UNumber, bottom: UNumber): object | null {
+    if (!this._CheckCommonInfo()) {
+      return null;
+    }
+    this._CommonInfoValid = false;
+
+    return this._BuildPack(ConditionSetBuilder.BoxPosition(left, top, right, bottom, this._CommonInfo));
+  }
+
   /**
    * AcrossPosition
    * 获取 AcrossPosition 的condition
@@ -74,26 +116,26 @@ class ConditionPackBuilder {
   }
 
   /**
-   * OnActEvent
+   * OnNexusEvent
    * 响应 actRef 关联的 action 所发出的内部状态信息
    * 
-   * @param {ActionRefObject} actRef 一个进行Action时传给action的空的{}, 内容被action内部填写
-   * @param {ActEventDefine} eventType 监听的事件类型
+   * @param {NexusNode} nexusRecv 一个进行Action时传给action的空的{}, 内容被action内部填写
+   * @param {number} detailEventType 监听的事件类型
    */
-  onActEvent(actRef: ActionRefObject, eventType: number): Object | null {
+  onNexusEvent(nexusRecv: NexusNode, detailEventType: number): Object | null {
     // CommonInfo 只能使用一次，规避多次使用问题
     if (!this._CheckCommonInfo()) {
       return null;
     }
     this._CommonInfoValid = false;
 
-    if (isNaN(actRef?.token) || isNaN(eventType)) {
+    if (isNaN(nexusRecv?.token) || isNaN(detailEventType)) {
       // 类型不符合
-      console.error("onActEvent params error", actRef, eventType);
+      console.error("onNexusEvent params error", nexusRecv, detailEventType);
       return null;
     }
 
-    return this._BuildPack(ConditionSetBuilder.OnActEvent(actRef.token, eventType, this._CommonInfo));
+    return this._BuildPack(ConditionSetBuilder.OnNexusEvent(nexusRecv.token, detailEventType, this._CommonInfo));
   }
 
   /**
@@ -101,9 +143,9 @@ class ConditionPackBuilder {
    * 监听Actor关联的LayoutView与blocker碰撞的状态
    * 碰撞发生后，可以 State.revertWithHitBlock 将LayoutView返回到紧贴到碰撞点的状态
    * 
-   * @param {Number} blkGID 想监听的blocker集群的组ID, 例如所有的跳板横向碰撞面，或者所有的跳板边缘的纵向碰撞面, 0为无效值
+   * @param {number} blkGID 想监听的blocker集群的组ID, 例如所有的跳板横向碰撞面，或者所有的跳板边缘的纵向碰撞面, 0为无效值
    */
-  OnHitBlock(blkGID: Number) {
+  onHitBlock(blkGID: number) {
     // CommonInfo 只能使用一次，规避多次使用问题
     if (!this._CheckCommonInfo()) {
       return null;
@@ -113,6 +155,81 @@ class ConditionPackBuilder {
     return this._BuildPack(ConditionSetBuilder.OnHitBlock(blkGID, this._CommonInfo));
   }
 
+  /**
+   * onNextTick
+   * 用于对一些Condition激活进行延迟，例如teleportTo处理后延迟激活 OnHitBlock 动作，规避teleportTo处理直接触发OnHitBlocker
+   * 
+   */
+  onNextTick(tickGap: number = 1) {
+    // CommonInfo 只能使用一次，规避多次使用问题
+    if (!this._CheckCommonInfo()) {
+      return null;
+    }
+    this._CommonInfoValid = false;
+    if (tickGap <= 0) {
+      tickGap = 1;
+    }
+
+    return this._BuildPack(ConditionSetBuilder.OnNextTick(tickGap, this._CommonInfo));
+  }
+
+  onDragStart() {
+    if (!this._CheckCommonInfo()) {
+      return null;
+    }
+    this._CommonInfoValid = false;
+
+    return this._BuildPack(ConditionSetBuilder.OnDragStart(this._CommonInfo, this._ContorlSlefNexus.token));
+  }
+
+  onDragEnd() {
+    if (!this._CheckCommonInfo()) {
+      return null;
+    }
+    this._CommonInfoValid = false;
+    return this._BuildPack(ConditionSetBuilder.OnDragEnd(this._CommonInfo, this._ContorlSlefNexus.token));
+  }
+
+  onTouchDown() {
+    if (!this._CheckCommonInfo()) {
+      return null;
+    }
+    this._CommonInfoValid = false;
+    return this._BuildPack(ConditionSetBuilder.OnTouchDown(this._CommonInfo, this._ContorlSlefNexus.token));
+  }
+
+  onTouchRelease() {
+    if (!this._CheckCommonInfo()) {
+      return null;
+    }
+    this._CommonInfoValid = false;
+    return this._BuildPack(ConditionSetBuilder.OnTouchRelease(this._CommonInfo, this._ContorlSlefNexus.token));
+  }
+
+  onFlingStart() {
+    if (!this._CheckCommonInfo()) {
+      return null;
+    }
+    this._CommonInfoValid = false;
+    return this._BuildPack(ConditionSetBuilder.OnFlingStart(this._CommonInfo, this._ContorlSlefNexus.token));
+  }
+
+  onFlingProgress() {
+    if (!this._CheckCommonInfo()) {
+      return null;
+    }
+    this._CommonInfoValid = false;
+    return this._BuildPack(ConditionSetBuilder.OnFlingProgress(this._CommonInfo, this._ContorlSlefNexus.token));
+  }
+
+  onFlingEnd() {
+    if (!this._CheckCommonInfo()) {
+      return null;
+    }
+    this._CommonInfoValid = false;
+    return this._BuildPack(ConditionSetBuilder.OnFlingEnd(this._CommonInfo, this._ContorlSlefNexus.token));
+  }
+
   _CheckCommonInfo(): boolean {
     if (!this._CommonInfoValid) {
       console.error("Error: must call from new conditoin()");

package/utils/JsViewVueWidget/JsvFreeMoveActor/SetState.ts

@@ -1,5 +1,6 @@
 
 import { StateCmdBuilder, CmdPackBuilder } from "./ForgeTypeDefine"
+import { NexusNode } from "./NexusNode";
 
 class StatePackBuilder {
   constructor() {
@@ -14,6 +15,39 @@ class StatePackBuilder {
     return CmdPackBuilder.InitStateCmdPack(StateCmdBuilder.RemoveAllCondtions());
   }
 
+  /*
+   * removeConditionByGroup
+   * 清理指定组的condition
+   */
+  removeConditionByGroup(group: number): Object {
+    return CmdPackBuilder.InitStateCmdPack(StateCmdBuilder.RemoveByGroup(group));
+  }
+
+  /**
+   * activeCondition
+   * 重新激活对应gid或者specName的condition
+   * 一个condition处于非激活有两种可能，
+   * 1. 允许触发一次的condition已经完成触发
+   * 2. 被DeactiveCondition关闭过的condition
+   * 
+   * @param {int} groupType  (可选)对应condition的groupType, 与specName二选一
+   * @param {String} specName  (可选)对应condition的specName, 与groupId二选一, 当groupId为 undefined 或 -1 时生效
+   */
+  activeCondition(groupType: number | undefined, specName: String | undefined): Object {
+    return CmdPackBuilder.InitStateCmdPack(StateCmdBuilder.ActiveCondition(groupType, specName));
+  }
+
+  /**
+   * deactiveCondition
+   * 停止对应gid或者specName的condition
+   * 
+   * @param {int} groupType  (可选)对应condition的groupType, 与specName二选一
+   * @param {String} specName  (可选)对应condition的specName, 与groupId二选一, 当groupId为 undefined 或 -1 时生效
+   */
+  deactiveCondition(groupType: number | undefined, specName: String | undefined): Object {
+    return CmdPackBuilder.InitStateCmdPack(StateCmdBuilder.DeactiveCondition(groupType, specName));
+  }
+
   /*
    * setStartPos 立刻将actor运动起始点设置到目标位置, 作为下一个Action执行时的位置起点
    *   注意1: 只影响当speed/accel不为0时的下一帧的运动起始位置，
@@ -48,6 +82,17 @@ class StatePackBuilder {
   revertWithHitBlock() {
     return CmdPackBuilder.InitStateCmdPack(StateCmdBuilder.RevertWithHitBlock());
   }
+
+  setHitWallOverflow() {
+    return CmdPackBuilder.InitStateCmdPack(StateCmdBuilder.SetHitWallOverflow());
+  }
+
+  /*
+   * fireNexusEvent 发出Nexus event
+   */
+  fireNexusEvent(nexusRecv: NexusNode, detailEventType: number) {
+    return CmdPackBuilder.InitStateCmdPack(StateCmdBuilder.FireNexusEvent(detailEventType, nexusRecv.token));
+  }
 }
 
 export default StatePackBuilder;

package/utils/JsViewVueWidget/JsvFreeMoveActor/index.js

@@ -1,13 +1,21 @@
 import JsvFreeMoveActor from "./FreeMoveActor.vue";
 import { ActEventDefine } from "./ForgeTypeDefine.ts"
 import { default as KeepFlags } from "./KeepFlags.ts"
+import JsvEnvBlocker from "./JsvEnvBlocker.vue"
+import { newNexus } from "./NexusNode"
 
 let FreeMoveDef = {
     ActEventDefine,
-    KeepFlags
+    KeepFlags,
+}
+
+let FreeMoveFunc = {
+    newNexus,
 }
 
 export {
     JsvFreeMoveActor,
-    FreeMoveDef
+    JsvEnvBlocker,
+    FreeMoveDef,
+    FreeMoveFunc
 }

package/utils/JsViewVueWidget/JsvGrid.vue

@@ -66,7 +66,7 @@
 -->
 <script>
 import { reactive } from "vue";
-import { EdgeDirection, FocusMoveType } from "jsview/utils/JsViewEngineWidget";
+import { EdgeDirection, FocusMoveType } from "../JsViewEngineWidget";
 
 const TAG = "JsvGrid";
 

package/utils/JsViewVueWidget/JsvHole.js

@@ -1,4 +1,4 @@
-/*
+/*!
  * 【模块 export 内容】
  * JsvHole 为video展示区域挖洞
  *      props说明:

package/utils/JsViewVueWidget/JsvInput/JsvInput.vue

@@ -5,7 +5,7 @@
  * @Description: file content
 -->
 <script>
-import { EdgeDirection } from "jsview/utils/JsViewEngineWidget";
+import { EdgeDirection } from "../../JsViewEngineWidget";
 import { Forge } from "@shijiu/jsview/dom/jsv-forge-define";
 import CursorVue from "./Cursor.vue";
 

package/utils/JsViewVueWidget/JsvLine/JsvLine.vue

@@ -1,14 +1,14 @@
 <!--
  * 【模块 export 内容】
  * JsvLine：Vue高阶组件，用于划线。支持横线、竖线和斜线。
- *      props说明:
+ *      props说明:(注意:全部属性非响应式, 需要变更时用 key 来触发重绘)
  *          startPos         {Object}   (必填) 起始位置，属性:x,y
  *          endPos           {Object}   (必填) 结束位置, 属性:x,y
  *          lineWidth        {Number}   (必填) 线条的粗细程度
  *          appear           {String}   线条的出现方式 fadeIn 淡入 / fadeOut 淡出
  *          backgroundImage  {String}   背景图片
  *          backgroundColor  {String}   背景颜色，默认值:白色#FFFFFF
- *          borderRadius     {Number}   圆角
+ *          borderRadius     {Number}   圆角半径
  * 
 -->
 

package/utils/JsViewVueWidget/JsvLine/LineManager.js

@@ -1,4 +1,4 @@
-import { JsvTextureStoreApi } from "jsview";
+import { JsvTextureStoreApi } from "../../JsViewVueTools";
 
 let sMap = new Map();
 
@@ -30,17 +30,20 @@ const createTexture = (lineWidth, color) => {
 
 class LineTexture {
     constructor(lineWidth, color) {
+        this.key = `${lineWidth}${color}`
+        if (lineWidth < 8) {
+            lineWidth = 8
+        }
         this.bitmap = {
             width: 2,
             height: lineWidth + 2
         }
-        this.key = `${lineWidth}${color}`
         this.count = 0
         this.newLineWidth = Math.floor(lineWidth / 2);
         //画布
         this.canvasTexture = JsvTextureStoreApi.canvasTexture(this.bitmap.width, this.bitmap.height)
         //绘画
-        this.canvasTexture.drawLine(-1,this.newLineWidth + 1, 3,this.newLineWidth + 1, lineWidth, color);
+        this.canvasTexture.drawLine(-1, this.newLineWidth + 1, 3, this.newLineWidth + 1, lineWidth, color);
         //sourceId赋值
         this.sourceId = this.canvasTexture.commit();
     }
@@ -56,7 +59,6 @@ class LineTexture {
             JsvTextureStoreApi.deleteTexture(this.sourceId);
             sMap.delete(this.key)
         }
-        console.log(sMap);
     }
 }
 export { createTexture };