🆙 Fix Sleep & Blinking eye's

This commit is contained in:
duckietm
2026-03-02 16:52:08 +01:00
parent 408fd28d55
commit b456def1de
5 changed files with 57 additions and 23 deletions
+7
View File
@@ -371,6 +371,12 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
return texture;
}
public getAsset(name: string): IGraphicAsset
{
return this._assets.getAsset(name);
}
public getDirection(): number
{
return this._mainDirection;
@@ -460,6 +466,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener
case AvatarAction.TALK:
case AvatarAction.EXPRESSION_WAVE:
case AvatarAction.SLEEP:
case AvatarAction.BLINK:
case AvatarAction.SIGN:
case AvatarAction.EXPRESSION_RESPECT:
case AvatarAction.EXPRESSION_BLOW_A_KISS:
@@ -27,6 +27,7 @@ export class AvatarActionManager
const definition = new ActionDefinition(action);
this._actions.set(definition.state, definition);
this._actions.set(definition.state.toLowerCase(), definition);
}
if(data.actionOffsets) this.parseActionOffsets(data.actionOffsets);
@@ -38,7 +39,7 @@ export class AvatarActionManager
for(const offset of offsets)
{
const action = this._actions.get(offset.action);
const action = this.getActionByState(offset.action);
if(!action) continue;
@@ -58,6 +59,13 @@ export class AvatarActionManager
}
}
private getActionByState(state: string): ActionDefinition
{
if(!state) return null;
return (this._actions.get(state) || this._actions.get(state.toLowerCase()) || this._actions.get(state.toUpperCase()) || null);
}
public getActionDefinition(id: string): ActionDefinition
{
if(!id) return null;
@@ -74,11 +82,7 @@ export class AvatarActionManager
public getActionDefinitionWithState(state: string): ActionDefinition
{
const existing = this._actions.get(state);
if(!existing) return null;
return existing;
return this.getActionByState(state);
}
public getDefaultAction(): ActionDefinition
@@ -105,7 +109,7 @@ export class AvatarActionManager
{
if(!activeAction) continue;
const action = this._actions.get(activeAction.actionType);
const action = this.getActionByState(activeAction.actionType);
const offsets = action && action.getOffsets(_arg_2, _arg_3);
if(offsets) canvasOffsets = offsets;
@@ -126,7 +130,7 @@ export class AvatarActionManager
{
if(!action) continue;
const definition = this._actions.get(action.actionType);
const definition = this.getActionByState(action.actionType);
if(!definition) continue;
@@ -161,7 +165,7 @@ export class AvatarActionManager
{
if(!action) continue;
const localAction = this._actions.get(action.actionType);
const localAction = this.getActionByState(action.actionType);
if(localAction) preventions = preventions.concat(localAction.getPrevents(action.actionParameter));
}