优化3把手木仓的动画

This commit is contained in:
Atsuihsio 2025-01-09 00:49:21 +08:00
parent a6579dd6e7
commit 8975582a11
20 changed files with 1197 additions and 3172 deletions

View file

@ -63,27 +63,25 @@ public class Glock17ItemModel extends GeoModel<Glock17Item> {
double fp = ClientEventHandler.firePos; double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot; double fr = ClientEventHandler.fireRot;
gun.setPosX(-1.34f * (float) zp); gun.setPosX(2.23f * (float) zp);
gun.setPosY(5.05f * (float) zp - (float) (0.2f * zpz)); gun.setPosY(3.15f * (float) zp - (float) (0.2f * zpz));
gun.setPosZ(5f * (float) zp + (float) (0.3f * zpz)); gun.setPosZ(5f * (float) zp + (float) (0.3f * zpz));
gun.setScaleZ(1f - (0.35f * (float) zp)); gun.setScaleZ(1f - (0.35f * (float) zp));
gun.setRotZ(-11 * Mth.DEG_TO_RAD * (float) zp + (float) (0.05f * zpz));
shen.setPosX((float) (0.95f * ClientEventHandler.recoilHorizon * fpz * fp)); shen.setPosX((float) (0.95f * ClientEventHandler.recoilHorizon * fpz * fp));
shen.setPosY((float) (0.21f * fp + 0.25f * fr)); shen.setPosY((float) (0.25f * fp + 0.28f * fr));
shen.setPosZ((float) (2.375 * fp + 0.44f * fr + 0.75 * fpz)); shen.setPosZ((float) (2.375 * fp + 0.44f * fr + 0.75 * fpz));
shen.setRotX((float) (0.01f * fp + 0.05f * fr + 0.01f * fpz)); shen.setRotX((float) (0.15f * fp + 0.3f * fr + 0.3f * fpz));
shen.setRotY((float) (0.1f * ClientEventHandler.recoilHorizon * fpz)); shen.setRotY((float) (0.1f * ClientEventHandler.recoilHorizon * fpz));
shen.setRotZ((float) ((0.08f + 0.1 * fr) * ClientEventHandler.recoilHorizon)); shen.setRotZ((float) ((0.08f + 0.1 * fr) * ClientEventHandler.recoilHorizon));
shen.setPosX((float) (shen.getPosX() * (1 - 0.4 * zt))); shen.setPosX((float) (shen.getPosX() * (1 - 0.4 * zt)));
shen.setPosY((float) (shen.getPosY() * (1 - 0.5 * zt))); shen.setPosY((float) (shen.getPosY() * (1 - 0.5 * zt)));
shen.setPosZ((float) (shen.getPosZ() * (1 - 0.3 * zt))); shen.setPosZ((float) (shen.getPosZ() * (1 - 0.3 * zt)));
shen.setRotX((float) (shen.getRotX() * (1 - 0.27 * zt))); shen.setRotX((float) (shen.getRotX() * (1 - 0.8 * zt)));
shen.setRotY((float) (shen.getRotY() * (1 - 0.7 * zt))); shen.setRotY((float) (shen.getRotY() * (1 - 0.7 * zt)));
shen.setRotZ((float) (shen.getRotZ() * (1 - 0.65 * zt))); shen.setRotZ((float) (shen.getRotZ() * (1 - 0.65 * zt)));
@ -127,8 +125,10 @@ public class Glock17ItemModel extends GeoModel<Glock17Item> {
AnimationHelper.handleShellsAnimation(getAnimationProcessor(), 0.7f, 1f); AnimationHelper.handleShellsAnimation(getAnimationProcessor(), 0.7f, 1f);
CoreGeoBone shell = getAnimationProcessor().getBone("shell"); CoreGeoBone shell = getAnimationProcessor().getBone("shell");
CoreGeoBone barrel = getAnimationProcessor().getBone("guan");
if (GunsTool.getGunBooleanTag(stack, "HoldOpen")) { if (GunsTool.getGunBooleanTag(stack, "HoldOpen")) {
slide.setPosZ(1.5f); slide.setPosZ(1.5f);
barrel.setRotX(4 * Mth.DEG_TO_RAD);
bullet.setScaleX(0); bullet.setScaleX(0);
bullet.setScaleY(0); bullet.setScaleY(0);
bullet.setScaleZ(0); bullet.setScaleZ(0);
@ -137,6 +137,7 @@ public class Glock17ItemModel extends GeoModel<Glock17Item> {
shell.setScaleY(0); shell.setScaleY(0);
shell.setScaleZ(0); shell.setScaleZ(0);
} else { } else {
barrel.setRotX(0);
bullet.setScaleX(1); bullet.setScaleX(1);
bullet.setScaleY(1); bullet.setScaleY(1);
bullet.setScaleZ(1); bullet.setScaleZ(1);

View file

@ -72,27 +72,25 @@ public class Glock18ItemModel extends GeoModel<Glock18Item> {
double fp = ClientEventHandler.firePos; double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot; double fr = ClientEventHandler.fireRot;
gun.setPosX(-1.34f * (float) zp); gun.setPosX(2.23f * (float) zp);
gun.setPosY(5.05f * (float) zp - (float) (0.2f * zpz)); gun.setPosY(3.15f * (float) zp - (float) (0.2f * zpz));
gun.setPosZ(5f * (float) zp + (float) (0.3f * zpz)); gun.setPosZ(5f * (float) zp + (float) (0.3f * zpz));
gun.setScaleZ(1f - (0.35f * (float) zp)); gun.setScaleZ(1f - (0.35f * (float) zp));
gun.setRotZ(-11 * Mth.DEG_TO_RAD * (float) zp + (float) (0.05f * zpz));
shen.setPosX((float) (0.95f * ClientEventHandler.recoilHorizon * fpz * fp)); shen.setPosX((float) (0.95f * ClientEventHandler.recoilHorizon * fpz * fp));
shen.setPosY((float) (0.21f * fp + 0.25f * fr)); shen.setPosY((float) (0.25f * fp + 0.28f * fr));
shen.setPosZ((float) (2.375 * fp + 0.44f * fr + 0.75 * fpz)); shen.setPosZ((float) (2.375 * fp + 0.44f * fr + 0.75 * fpz));
shen.setRotX((float) (0.01f * fp + 0.05f * fr + 0.01f * fpz)); shen.setRotX((float) (0.15f * fp + 0.3f * fr + 0.3f * fpz));
shen.setRotY((float) (0.1f * ClientEventHandler.recoilHorizon * fpz)); shen.setRotY((float) (0.1f * ClientEventHandler.recoilHorizon * fpz));
shen.setRotZ((float) ((0.08f + 0.1 * fr) * ClientEventHandler.recoilHorizon)); shen.setRotZ((float) ((0.08f + 0.1 * fr) * ClientEventHandler.recoilHorizon));
shen.setPosX((float) (shen.getPosX() * (1 - 0.4 * zt))); shen.setPosX((float) (shen.getPosX() * (1 - 0.4 * zt)));
shen.setPosY((float) (shen.getPosY() * (1 - 0.5 * zt))); shen.setPosY((float) (shen.getPosY() * (1 - 0.5 * zt)));
shen.setPosZ((float) (shen.getPosZ() * (1 - 0.3 * zt))); shen.setPosZ((float) (shen.getPosZ() * (1 - 0.3 * zt)));
shen.setRotX((float) (shen.getRotX() * (1 - 0.27 * zt))); shen.setRotX((float) (shen.getRotX() * (1 - 0.8 * zt)));
shen.setRotY((float) (shen.getRotY() * (1 - 0.7 * zt))); shen.setRotY((float) (shen.getRotY() * (1 - 0.7 * zt)));
shen.setRotZ((float) (shen.getRotZ() * (1 - 0.65 * zt))); shen.setRotZ((float) (shen.getRotZ() * (1 - 0.65 * zt)));
@ -136,8 +134,10 @@ public class Glock18ItemModel extends GeoModel<Glock18Item> {
AnimationHelper.handleShellsAnimation(getAnimationProcessor(), 0.7f, 1f); AnimationHelper.handleShellsAnimation(getAnimationProcessor(), 0.7f, 1f);
CoreGeoBone shell = getAnimationProcessor().getBone("shell"); CoreGeoBone shell = getAnimationProcessor().getBone("shell");
CoreGeoBone barrel = getAnimationProcessor().getBone("guan");
if (GunsTool.getGunBooleanTag(stack, "HoldOpen")) { if (GunsTool.getGunBooleanTag(stack, "HoldOpen")) {
slide.setPosZ(1.5f); slide.setPosZ(1.5f);
barrel.setRotX(4 * Mth.DEG_TO_RAD);
bullet.setScaleX(0); bullet.setScaleX(0);
bullet.setScaleY(0); bullet.setScaleY(0);
bullet.setScaleZ(0); bullet.setScaleZ(0);
@ -146,6 +146,7 @@ public class Glock18ItemModel extends GeoModel<Glock18Item> {
shell.setScaleY(0); shell.setScaleY(0);
shell.setScaleZ(0); shell.setScaleZ(0);
} else { } else {
barrel.setRotX(0);
bullet.setScaleX(1); bullet.setScaleX(1);
bullet.setScaleY(1); bullet.setScaleY(1);
bullet.setScaleZ(1); bullet.setScaleZ(1);

View file

@ -20,7 +20,7 @@ public class M1911ItemModel extends GeoModel<M1911Item> {
@Override @Override
public ResourceLocation getAnimationResource(M1911Item animatable) { public ResourceLocation getAnimationResource(M1911Item animatable) {
return ModUtils.loc("animations/m1911.animation.json"); return ModUtils.loc("animations/glock17.animation.json");
} }
@Override @Override
@ -64,11 +64,11 @@ public class M1911ItemModel extends GeoModel<M1911Item> {
double fp = ClientEventHandler.firePos; double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot; double fr = ClientEventHandler.fireRot;
gun.setPosX(1.86f * (float) zp); gun.setPosX(2.23f * (float) zp);
gun.setPosY(1.55f * (float) zp - (float) (0.2f * zpz)); gun.setPosY(3.15f * (float) zp - (float) (0.2f * zpz));
gun.setPosZ(2f * (float) zp + (float) (0.3f * zpz)); gun.setPosZ(5f * (float) zp + (float) (0.3f * zpz));
gun.setScaleZ(1f - (0.35f * (float) zp)); gun.setScaleZ(1f - (0.35f * (float) zp));
@ -82,7 +82,7 @@ public class M1911ItemModel extends GeoModel<M1911Item> {
shen.setPosX((float) (shen.getPosX() * (1 - 0.4 * zt))); shen.setPosX((float) (shen.getPosX() * (1 - 0.4 * zt)));
shen.setPosY((float) (shen.getPosY() * (1 - 0.5 * zt))); shen.setPosY((float) (shen.getPosY() * (1 - 0.5 * zt)));
shen.setPosZ((float) (shen.getPosZ() * (1 - 0.3 * zt))); shen.setPosZ((float) (shen.getPosZ() * (1 - 0.3 * zt)));
shen.setRotX((float) (shen.getRotX() * (1 - 0.27 * zt))); shen.setRotX((float) (shen.getRotX() * (1 - 0.5 * zt)));
shen.setRotY((float) (shen.getRotY() * (1 - 0.7 * zt))); shen.setRotY((float) (shen.getRotY() * (1 - 0.7 * zt)));
shen.setRotZ((float) (shen.getRotZ() * (1 - 0.65 * zt))); shen.setRotZ((float) (shen.getRotZ() * (1 - 0.65 * zt)));

View file

@ -351,7 +351,7 @@ public class GunEventHandler {
if (data.getInt("ReloadTime") == 84) { if (data.getInt("ReloadTime") == 84) {
tag.putBoolean("empty", false); tag.putBoolean("empty", false);
} }
if (data.getInt("ReloadTime") == 7) { if (data.getInt("ReloadTime") == 9) {
data.putBoolean("CloseHammer", false); data.putBoolean("CloseHammer", false);
} }
} }
@ -375,7 +375,7 @@ public class GunEventHandler {
} }
if (stack.getItem() == ModItems.GLOCK_17.get() || stack.getItem() == ModItems.GLOCK_18.get() || stack.getItem() == ModItems.M_1911.get()) { if (stack.getItem() == ModItems.GLOCK_17.get() || stack.getItem() == ModItems.GLOCK_18.get() || stack.getItem() == ModItems.M_1911.get()) {
if (data.getInt("ReloadTime") == 5) { if (data.getInt("ReloadTime") == 9) {
data.putBoolean("HoldOpen", false); data.putBoolean("HoldOpen", false);
} }
} }

View file

@ -110,7 +110,7 @@ public class Glock17Item extends GunItem implements GeoItem, AnimatedItem {
public void registerControllers(AnimatableManager.ControllerRegistrar data) { public void registerControllers(AnimatableManager.ControllerRegistrar data) {
var fireAnimController = new AnimationController<>(this, "fireAnimController", 1, this::fireAnimPredicate); var fireAnimController = new AnimationController<>(this, "fireAnimController", 1, this::fireAnimPredicate);
data.add(fireAnimController); data.add(fireAnimController);
var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); var idleController = new AnimationController<>(this, "idleController", 2, this::idlePredicate);
data.add(idleController); data.add(idleController);
} }

View file

@ -109,7 +109,7 @@ public class Glock18Item extends GunItem implements GeoItem, AnimatedItem {
public void registerControllers(AnimatableManager.ControllerRegistrar data) { public void registerControllers(AnimatableManager.ControllerRegistrar data) {
var fireAnimController = new AnimationController<>(this, "fireAnimController", 1, this::fireAnimPredicate); var fireAnimController = new AnimationController<>(this, "fireAnimController", 1, this::fireAnimPredicate);
data.add(fireAnimController); data.add(fireAnimController);
var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); var idleController = new AnimationController<>(this, "idleController", 2, this::idlePredicate);
data.add(idleController); data.add(idleController);
} }

View file

@ -67,36 +67,48 @@ public class M1911Item extends GunItem implements GeoItem, AnimatedItem {
transformType = type; transformType = type;
} }
private PlayState idlePredicate(AnimationState<M1911Item> event) { private PlayState fireAnimPredicate(AnimationState<M1911Item> event) {
LocalPlayer player = Minecraft.getInstance().player; LocalPlayer player = Minecraft.getInstance().player;
if (player == null) return PlayState.STOP; if (player == null) return PlayState.STOP;
ItemStack stack = player.getMainHandItem(); ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP;
if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) { if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m1911.reload_empty")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.glock.reload_empty"));
} }
if (stack.getOrCreateTag().getBoolean("is_normal_reloading")) { if (stack.getOrCreateTag().getBoolean("is_normal_reloading")) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m1911.reload_normal")); return event.setAndContinue(RawAnimation.begin().thenPlay("animation.glock.reload_normal"));
} }
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.idle"));
}
private PlayState idlePredicate(AnimationState<M1911Item> event) {
LocalPlayer player = Minecraft.getInstance().player;
if (player == null) return PlayState.STOP;
ItemStack stack = player.getMainHandItem();
if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP;
if (player.isSprinting() && player.onGround() if (player.isSprinting() && player.onGround()
&& player.getPersistentData().getDouble("noRun") == 0 && player.getPersistentData().getDouble("noRun") == 0
&& !(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading")) && ClientEventHandler.drawTime < 0.01) { && !(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading")) && ClientEventHandler.drawTime < 0.01) {
if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m1911.run_fast")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.run_fast"));
} else { } else {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m1911.run")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.run"));
} }
} }
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m1911.idle")); return event.setAndContinue(RawAnimation.begin().thenLoop("animation.glock.idle"));
} }
@Override @Override
public void registerControllers(AnimatableManager.ControllerRegistrar data) { public void registerControllers(AnimatableManager.ControllerRegistrar data) {
var fireAnimController = new AnimationController<>(this, "fireAnimController", 1, this::fireAnimPredicate);
data.add(fireAnimController);
var idleController = new AnimationController<>(this, "idleController", 2, this::idlePredicate); var idleController = new AnimationController<>(this, "idleController", 2, this::idlePredicate);
data.add(idleController); data.add(idleController);
} }

View file

@ -34,35 +34,9 @@
"parent": "shen", "parent": "shen",
"pivot": [0, 0, 0] "pivot": [0, 0, 0]
}, },
{
"name": "roll",
"parent": "0",
"pivot": [0, 0, 0],
"rotation": [0, 0, 11]
},
{
"name": "Lefthand",
"parent": "roll",
"pivot": [2.6976, -5.69887, 9.77824],
"rotation": [113.29762, -12.57035, 179.33701],
"cubes": [
{
"origin": [0.6476, -5.69887, 7.82824],
"size": [4, 12, 4],
"uv": {
"north": {"uv": [0, 36], "uv_size": [1, 1]},
"east": {"uv": [0, 36], "uv_size": [1, 1]},
"south": {"uv": [0, 36], "uv_size": [1, 1]},
"west": {"uv": [0, 36], "uv_size": [1, 1]},
"up": {"uv": [1, 37], "uv_size": [-1, -1]},
"down": {"uv": [1, 37], "uv_size": [-1, -1]}
}
}
]
},
{ {
"name": "gun", "name": "gun",
"parent": "roll", "parent": "0",
"pivot": [0, 0.46563, 1.72795] "pivot": [0, 0.46563, 1.72795]
}, },
{ {
@ -99,6 +73,192 @@
} }
] ]
}, },
{
"name": "magazine",
"parent": "gun",
"pivot": [0, -0.3, 1.8]
},
{
"name": "Lefthand",
"parent": "magazine",
"pivot": [2.6976, -5.69887, 9.77824],
"rotation": [113.29762, -12.57035, 179.33701],
"cubes": [
{
"origin": [0.6476, -5.69887, 7.82824],
"size": [4, 12, 4],
"uv": {
"north": {"uv": [0, 36], "uv_size": [1, 1]},
"east": {"uv": [0, 36], "uv_size": [1, 1]},
"south": {"uv": [0, 36], "uv_size": [1, 1]},
"west": {"uv": [0, 36], "uv_size": [1, 1]},
"up": {"uv": [1, 37], "uv_size": [-1, -1]},
"down": {"uv": [1, 37], "uv_size": [-1, -1]}
}
}
]
},
{
"name": "bullet",
"parent": "magazine",
"pivot": [0, 2.04506, 1.58179],
"cubes": [
{
"origin": [-0.26066, 1.7844, 1.37382],
"size": [0.52132, 0.52132, 0.87264],
"uv": {
"north": {"uv": [29, 18], "uv_size": [0.5, 0.5]},
"east": {"uv": [27, 3], "uv_size": [0.75, 0.5]},
"south": {"uv": [19, 29], "uv_size": [0.5, 0.5]},
"west": {"uv": [4, 27], "uv_size": [0.75, 0.5]},
"up": {"uv": [27, 4], "uv_size": [0.5, 0.75]},
"down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]}
}
},
{
"origin": [-0.22434, 1.82073, 0.92637],
"size": [0.44867, 0.44867, 1.44011],
"uv": {
"north": {"uv": [29, 19], "uv_size": [0.5, 0.5]},
"east": {"uv": [5, 21], "uv_size": [1.5, 0.5]},
"south": {"uv": [20, 29], "uv_size": [0.5, 0.5]},
"west": {"uv": [7, 21], "uv_size": [1.5, 0.5]},
"up": {"uv": [1, 21], "uv_size": [0.5, 1.5]},
"down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]}
}
},
{
"origin": [-0.26066, 1.7844, 2.329],
"size": [0.52132, 0.52132, 0.13453],
"uv": {
"north": {"uv": [29, 20], "uv_size": [0.5, 0.5]},
"east": {"uv": [32, 4], "uv_size": [0.25, 0.5]},
"south": {"uv": [21, 29], "uv_size": [0.5, 0.5]},
"west": {"uv": [5, 32], "uv_size": [0.25, 0.5]},
"up": {"uv": [32, 5], "uv_size": [0.5, 0.25]},
"down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]}
}
}
]
},
{
"name": "mag",
"parent": "magazine",
"pivot": [0.24823, -5.38367, 0.94374],
"cubes": [
{
"origin": [-0.625, -3.29687, 2.66311],
"size": [1.25, 0.21875, 1.95],
"uv": {
"east": {"uv": [20, 24], "uv_size": [2, 0.25]},
"south": {"uv": [27, 10], "uv_size": [1.25, 0.25]},
"west": {"uv": [24, 20], "uv_size": [2, 0.25]},
"up": {"uv": [8, 14], "uv_size": [1.25, 2]},
"down": {"uv": [14, 10], "uv_size": [1.25, -2]}
}
},
{
"origin": [-0.5, -3.07812, 3.36311],
"size": [1, 0.21875, 0.75],
"uv": {
"east": {"uv": [30, 2], "uv_size": [0.75, 0.25]},
"west": {"uv": [3, 30], "uv_size": [0.75, 0.25]}
}
},
{
"origin": [-0.475, -3.29687, 2.51311],
"size": [0.95, 0.21875, 0.15],
"uv": {
"north": {"uv": [28, 28], "uv_size": [1, 0.25]},
"up": {"uv": [0, 29], "uv_size": [1, 0.25]},
"down": {"uv": [29, 0.25], "uv_size": [1, -0.25]}
}
},
{
"origin": [1.63218, -3.29687, 1.77338],
"size": [0.21293, 0.21875, 0.10938],
"pivot": [0.16105, -2.05902, 0.74544],
"rotation": [0, -45, 0],
"uv": {
"north": {"uv": [0, 33], "uv_size": [0.25, 0.25]},
"up": {"uv": [33, 0], "uv_size": [0.25, 0.25]},
"down": {"uv": [1, 33.25], "uv_size": [0.25, -0.25]}
}
},
{
"origin": [-1.84511, -3.29687, 1.77338],
"size": [0.21293, 0.21875, 0.10938],
"pivot": [-0.16105, -2.05902, 0.74544],
"rotation": [0, 45, 0],
"uv": {
"north": {"uv": [35, 24], "uv_size": [0.25, 0.25]},
"up": {"uv": [25, 35], "uv_size": [0.25, 0.25]},
"down": {"uv": [35, 25.25], "uv_size": [0.25, -0.25]}
}
},
{
"origin": [-0.5005, -4.49049, 3.36385],
"size": [1.001, 5.4385, 0.5635],
"pivot": [0.06161, -2.05902, 0.721],
"rotation": [22.5, 0, 0],
"uv": {
"north": {"uv": [6, 10], "uv_size": [1, 5.5]},
"east": {"uv": [13, 11], "uv_size": [0.5, 5.5]},
"south": {"uv": [7, 10], "uv_size": [1, 5.5]},
"west": {"uv": [0, 14], "uv_size": [0.5, 5.5]}
}
},
{
"origin": [-0.5005, -4.02174, 2.22635],
"size": [1.001, 5.19397, 1.1385],
"pivot": [0.06161, -2.05902, 0.721],
"rotation": [22.5, 0, 0],
"uv": {
"north": {"uv": [12, 0], "uv_size": [1, 5.25]},
"east": {"uv": [6, 4], "uv_size": [1.25, 5.25]},
"west": {"uv": [0, 8], "uv_size": [1.25, 5.25]},
"up": {"uv": [13, 17], "uv_size": [1, 1.25]},
"down": {"uv": [17, 16.25], "uv_size": [1, -1.25]}
}
},
{
"origin": [-0.4995, 1.50233, 0.87522],
"size": [1, 0.44141, 1.66328],
"uv": {
"north": {"uv": [24, 21], "uv_size": [1, 0.5]},
"east": {"uv": [20, 2], "uv_size": [1.75, 0.5]},
"west": {"uv": [3, 20], "uv_size": [1.75, 0.5]},
"up": {"uv": [16, 0], "uv_size": [1, 1.75]}
}
},
{
"origin": [-1.99396, 1.44791, 1.1635],
"size": [0.125, 0.25, 1.375],
"pivot": [-0.00039, -2.06076, 0.72723],
"rotation": [0, 0, 22.5],
"uv": {
"north": {"uv": [33, 1], "uv_size": [0.25, 0.25]},
"east": {"uv": [26, 8], "uv_size": [1.5, 0.25]},
"south": {"uv": [2, 33], "uv_size": [0.25, 0.25]},
"west": {"uv": [26, 9], "uv_size": [1.5, 0.25]},
"up": {"uv": [10, 26], "uv_size": [0.25, 1.5]}
}
},
{
"origin": [1.87934, 1.49507, 1.1635],
"size": [0.125, 0.25, 1.375],
"pivot": [0.12462, -2.06076, 0.72723],
"rotation": [0, 0, -22.5],
"uv": {
"north": {"uv": [33, 2], "uv_size": [0.25, 0.25]},
"east": {"uv": [11, 26], "uv_size": [1.5, 0.25]},
"south": {"uv": [3, 33], "uv_size": [0.25, 0.25]},
"west": {"uv": [13, 26], "uv_size": [1.5, 0.25]},
"up": {"uv": [15, 26], "uv_size": [0.25, 1.5]}
}
}
]
},
{ {
"name": "body", "name": "body",
"parent": "gun", "parent": "gun",
@ -1459,172 +1619,6 @@
} }
] ]
}, },
{
"name": "magazine",
"parent": "body",
"pivot": [0, -0.3, 1.8]
},
{
"name": "bullet",
"parent": "magazine",
"pivot": [0, 2.04506, 1.58179],
"cubes": [
{
"origin": [-0.26066, 1.7844, 1.37382],
"size": [0.52132, 0.52132, 0.87264],
"uv": {
"north": {"uv": [29, 18], "uv_size": [0.5, 0.5]},
"east": {"uv": [27, 3], "uv_size": [0.75, 0.5]},
"south": {"uv": [19, 29], "uv_size": [0.5, 0.5]},
"west": {"uv": [4, 27], "uv_size": [0.75, 0.5]},
"up": {"uv": [27, 4], "uv_size": [0.5, 0.75]},
"down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]}
}
},
{
"origin": [-0.22434, 1.82073, 0.92637],
"size": [0.44867, 0.44867, 1.44011],
"uv": {
"north": {"uv": [29, 19], "uv_size": [0.5, 0.5]},
"east": {"uv": [5, 21], "uv_size": [1.5, 0.5]},
"south": {"uv": [20, 29], "uv_size": [0.5, 0.5]},
"west": {"uv": [7, 21], "uv_size": [1.5, 0.5]},
"up": {"uv": [1, 21], "uv_size": [0.5, 1.5]},
"down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]}
}
},
{
"origin": [-0.26066, 1.7844, 2.329],
"size": [0.52132, 0.52132, 0.13453],
"uv": {
"north": {"uv": [29, 20], "uv_size": [0.5, 0.5]},
"east": {"uv": [32, 4], "uv_size": [0.25, 0.5]},
"south": {"uv": [21, 29], "uv_size": [0.5, 0.5]},
"west": {"uv": [5, 32], "uv_size": [0.25, 0.5]},
"up": {"uv": [32, 5], "uv_size": [0.5, 0.25]},
"down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]}
}
}
]
},
{
"name": "mag",
"parent": "magazine",
"pivot": [0.24823, -5.38367, 0.94374],
"cubes": [
{
"origin": [-0.625, -3.29687, 2.66311],
"size": [1.25, 0.21875, 1.95],
"uv": {
"east": {"uv": [20, 24], "uv_size": [2, 0.25]},
"south": {"uv": [27, 10], "uv_size": [1.25, 0.25]},
"west": {"uv": [24, 20], "uv_size": [2, 0.25]},
"up": {"uv": [8, 14], "uv_size": [1.25, 2]},
"down": {"uv": [14, 10], "uv_size": [1.25, -2]}
}
},
{
"origin": [-0.5, -3.07812, 3.36311],
"size": [1, 0.21875, 0.75],
"uv": {
"east": {"uv": [30, 2], "uv_size": [0.75, 0.25]},
"west": {"uv": [3, 30], "uv_size": [0.75, 0.25]}
}
},
{
"origin": [-0.475, -3.29687, 2.51311],
"size": [0.95, 0.21875, 0.15],
"uv": {
"north": {"uv": [28, 28], "uv_size": [1, 0.25]},
"up": {"uv": [0, 29], "uv_size": [1, 0.25]},
"down": {"uv": [29, 0.25], "uv_size": [1, -0.25]}
}
},
{
"origin": [1.63218, -3.29687, 1.77338],
"size": [0.21293, 0.21875, 0.10938],
"pivot": [0.16105, -2.05902, 0.74544],
"rotation": [0, -45, 0],
"uv": {
"north": {"uv": [0, 33], "uv_size": [0.25, 0.25]},
"up": {"uv": [33, 0], "uv_size": [0.25, 0.25]},
"down": {"uv": [1, 33.25], "uv_size": [0.25, -0.25]}
}
},
{
"origin": [-1.84511, -3.29687, 1.77338],
"size": [0.21293, 0.21875, 0.10938],
"pivot": [-0.16105, -2.05902, 0.74544],
"rotation": [0, 45, 0],
"uv": {
"north": {"uv": [35, 24], "uv_size": [0.25, 0.25]},
"up": {"uv": [25, 35], "uv_size": [0.25, 0.25]},
"down": {"uv": [35, 25.25], "uv_size": [0.25, -0.25]}
}
},
{
"origin": [-0.5005, -4.49049, 3.36385],
"size": [1.001, 5.4385, 0.5635],
"pivot": [0.06161, -2.05902, 0.721],
"rotation": [22.5, 0, 0],
"uv": {
"north": {"uv": [6, 10], "uv_size": [1, 5.5]},
"east": {"uv": [13, 11], "uv_size": [0.5, 5.5]},
"south": {"uv": [7, 10], "uv_size": [1, 5.5]},
"west": {"uv": [0, 14], "uv_size": [0.5, 5.5]}
}
},
{
"origin": [-0.5005, -4.02174, 2.22635],
"size": [1.001, 5.19397, 1.1385],
"pivot": [0.06161, -2.05902, 0.721],
"rotation": [22.5, 0, 0],
"uv": {
"north": {"uv": [12, 0], "uv_size": [1, 5.25]},
"east": {"uv": [6, 4], "uv_size": [1.25, 5.25]},
"west": {"uv": [0, 8], "uv_size": [1.25, 5.25]},
"up": {"uv": [13, 17], "uv_size": [1, 1.25]},
"down": {"uv": [17, 16.25], "uv_size": [1, -1.25]}
}
},
{
"origin": [-0.4995, 1.50233, 0.87522],
"size": [1, 0.44141, 1.66328],
"uv": {
"north": {"uv": [24, 21], "uv_size": [1, 0.5]},
"east": {"uv": [20, 2], "uv_size": [1.75, 0.5]},
"west": {"uv": [3, 20], "uv_size": [1.75, 0.5]},
"up": {"uv": [16, 0], "uv_size": [1, 1.75]}
}
},
{
"origin": [-1.99396, 1.44791, 1.1635],
"size": [0.125, 0.25, 1.375],
"pivot": [-0.00039, -2.06076, 0.72723],
"rotation": [0, 0, 22.5],
"uv": {
"north": {"uv": [33, 1], "uv_size": [0.25, 0.25]},
"east": {"uv": [26, 8], "uv_size": [1.5, 0.25]},
"south": {"uv": [2, 33], "uv_size": [0.25, 0.25]},
"west": {"uv": [26, 9], "uv_size": [1.5, 0.25]},
"up": {"uv": [10, 26], "uv_size": [0.25, 1.5]}
}
},
{
"origin": [1.87934, 1.49507, 1.1635],
"size": [0.125, 0.25, 1.375],
"pivot": [0.12462, -2.06076, 0.72723],
"rotation": [0, 0, -22.5],
"uv": {
"north": {"uv": [33, 2], "uv_size": [0.25, 0.25]},
"east": {"uv": [11, 26], "uv_size": [1.5, 0.25]},
"south": {"uv": [3, 33], "uv_size": [0.25, 0.25]},
"west": {"uv": [13, 26], "uv_size": [1.5, 0.25]},
"up": {"uv": [15, 26], "uv_size": [0.25, 1.5]}
}
}
]
},
{ {
"name": "huatao", "name": "huatao",
"parent": "body", "parent": "body",

View file

@ -34,35 +34,9 @@
"parent": "shen", "parent": "shen",
"pivot": [0, 0, 0] "pivot": [0, 0, 0]
}, },
{
"name": "roll",
"parent": "0",
"pivot": [0, 0, 0],
"rotation": [0, 0, 11]
},
{
"name": "Lefthand",
"parent": "roll",
"pivot": [2.6976, -5.69887, 9.77824],
"rotation": [113.29762, -12.57035, 179.33701],
"cubes": [
{
"origin": [0.6476, -5.69887, 7.82824],
"size": [4, 12, 4],
"uv": {
"north": {"uv": [0, 36], "uv_size": [1, 1]},
"east": {"uv": [0, 36], "uv_size": [1, 1]},
"south": {"uv": [0, 36], "uv_size": [1, 1]},
"west": {"uv": [0, 36], "uv_size": [1, 1]},
"up": {"uv": [1, 37], "uv_size": [-1, -1]},
"down": {"uv": [1, 37], "uv_size": [-1, -1]}
}
}
]
},
{ {
"name": "gun", "name": "gun",
"parent": "roll", "parent": "0",
"pivot": [0, 0.46563, 1.72795] "pivot": [0, 0.46563, 1.72795]
}, },
{ {
@ -99,6 +73,192 @@
} }
] ]
}, },
{
"name": "magazine",
"parent": "gun",
"pivot": [0, -0.3, 1.8]
},
{
"name": "Lefthand",
"parent": "magazine",
"pivot": [2.6976, -5.69887, 9.77824],
"rotation": [113.29762, -12.57035, 179.33701],
"cubes": [
{
"origin": [0.6476, -5.69887, 7.82824],
"size": [4, 12, 4],
"uv": {
"north": {"uv": [0, 36], "uv_size": [1, 1]},
"east": {"uv": [0, 36], "uv_size": [1, 1]},
"south": {"uv": [0, 36], "uv_size": [1, 1]},
"west": {"uv": [0, 36], "uv_size": [1, 1]},
"up": {"uv": [1, 37], "uv_size": [-1, -1]},
"down": {"uv": [1, 37], "uv_size": [-1, -1]}
}
}
]
},
{
"name": "bullet",
"parent": "magazine",
"pivot": [0, 2.04506, 1.58179],
"cubes": [
{
"origin": [-0.26066, 1.7844, 1.37382],
"size": [0.52132, 0.52132, 0.87264],
"uv": {
"north": {"uv": [29, 18], "uv_size": [0.5, 0.5]},
"east": {"uv": [27, 3], "uv_size": [0.75, 0.5]},
"south": {"uv": [19, 29], "uv_size": [0.5, 0.5]},
"west": {"uv": [4, 27], "uv_size": [0.75, 0.5]},
"up": {"uv": [27, 4], "uv_size": [0.5, 0.75]},
"down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]}
}
},
{
"origin": [-0.22434, 1.82073, 0.92637],
"size": [0.44867, 0.44867, 1.44011],
"uv": {
"north": {"uv": [29, 19], "uv_size": [0.5, 0.5]},
"east": {"uv": [5, 21], "uv_size": [1.5, 0.5]},
"south": {"uv": [20, 29], "uv_size": [0.5, 0.5]},
"west": {"uv": [7, 21], "uv_size": [1.5, 0.5]},
"up": {"uv": [1, 21], "uv_size": [0.5, 1.5]},
"down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]}
}
},
{
"origin": [-0.26066, 1.7844, 2.329],
"size": [0.52132, 0.52132, 0.13453],
"uv": {
"north": {"uv": [29, 20], "uv_size": [0.5, 0.5]},
"east": {"uv": [32, 4], "uv_size": [0.25, 0.5]},
"south": {"uv": [21, 29], "uv_size": [0.5, 0.5]},
"west": {"uv": [5, 32], "uv_size": [0.25, 0.5]},
"up": {"uv": [32, 5], "uv_size": [0.5, 0.25]},
"down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]}
}
}
]
},
{
"name": "mag",
"parent": "magazine",
"pivot": [0.24823, -5.38367, 0.94374],
"cubes": [
{
"origin": [-0.625, -3.29687, 2.66311],
"size": [1.25, 0.21875, 1.95],
"uv": {
"east": {"uv": [20, 24], "uv_size": [2, 0.25]},
"south": {"uv": [27, 10], "uv_size": [1.25, 0.25]},
"west": {"uv": [24, 20], "uv_size": [2, 0.25]},
"up": {"uv": [8, 14], "uv_size": [1.25, 2]},
"down": {"uv": [14, 10], "uv_size": [1.25, -2]}
}
},
{
"origin": [-0.5, -3.07812, 3.36311],
"size": [1, 0.21875, 0.75],
"uv": {
"east": {"uv": [30, 2], "uv_size": [0.75, 0.25]},
"west": {"uv": [3, 30], "uv_size": [0.75, 0.25]}
}
},
{
"origin": [-0.475, -3.29687, 2.51311],
"size": [0.95, 0.21875, 0.15],
"uv": {
"north": {"uv": [28, 28], "uv_size": [1, 0.25]},
"up": {"uv": [0, 29], "uv_size": [1, 0.25]},
"down": {"uv": [29, 0.25], "uv_size": [1, -0.25]}
}
},
{
"origin": [1.63218, -3.29687, 1.77338],
"size": [0.21293, 0.21875, 0.10938],
"pivot": [0.16105, -2.05902, 0.74544],
"rotation": [0, -45, 0],
"uv": {
"north": {"uv": [0, 33], "uv_size": [0.25, 0.25]},
"up": {"uv": [33, 0], "uv_size": [0.25, 0.25]},
"down": {"uv": [1, 33.25], "uv_size": [0.25, -0.25]}
}
},
{
"origin": [-1.84511, -3.29687, 1.77338],
"size": [0.21293, 0.21875, 0.10938],
"pivot": [-0.16105, -2.05902, 0.74544],
"rotation": [0, 45, 0],
"uv": {
"north": {"uv": [35, 24], "uv_size": [0.25, 0.25]},
"up": {"uv": [25, 35], "uv_size": [0.25, 0.25]},
"down": {"uv": [35, 25.25], "uv_size": [0.25, -0.25]}
}
},
{
"origin": [-0.5005, -4.49049, 3.36385],
"size": [1.001, 5.4385, 0.5635],
"pivot": [0.06161, -2.05902, 0.721],
"rotation": [22.5, 0, 0],
"uv": {
"north": {"uv": [6, 10], "uv_size": [1, 5.5]},
"east": {"uv": [13, 11], "uv_size": [0.5, 5.5]},
"south": {"uv": [7, 10], "uv_size": [1, 5.5]},
"west": {"uv": [0, 14], "uv_size": [0.5, 5.5]}
}
},
{
"origin": [-0.5005, -4.02174, 2.22635],
"size": [1.001, 5.19397, 1.1385],
"pivot": [0.06161, -2.05902, 0.721],
"rotation": [22.5, 0, 0],
"uv": {
"north": {"uv": [12, 0], "uv_size": [1, 5.25]},
"east": {"uv": [6, 4], "uv_size": [1.25, 5.25]},
"west": {"uv": [0, 8], "uv_size": [1.25, 5.25]},
"up": {"uv": [13, 17], "uv_size": [1, 1.25]},
"down": {"uv": [17, 16.25], "uv_size": [1, -1.25]}
}
},
{
"origin": [-0.4995, 1.50233, 0.87522],
"size": [1, 0.44141, 1.66328],
"uv": {
"north": {"uv": [24, 21], "uv_size": [1, 0.5]},
"east": {"uv": [20, 2], "uv_size": [1.75, 0.5]},
"west": {"uv": [3, 20], "uv_size": [1.75, 0.5]},
"up": {"uv": [16, 0], "uv_size": [1, 1.75]}
}
},
{
"origin": [-1.99396, 1.44791, 1.1635],
"size": [0.125, 0.25, 1.375],
"pivot": [-0.00039, -2.06076, 0.72723],
"rotation": [0, 0, 22.5],
"uv": {
"north": {"uv": [33, 1], "uv_size": [0.25, 0.25]},
"east": {"uv": [26, 8], "uv_size": [1.5, 0.25]},
"south": {"uv": [2, 33], "uv_size": [0.25, 0.25]},
"west": {"uv": [26, 9], "uv_size": [1.5, 0.25]},
"up": {"uv": [10, 26], "uv_size": [0.25, 1.5]}
}
},
{
"origin": [1.87934, 1.49507, 1.1635],
"size": [0.125, 0.25, 1.375],
"pivot": [0.12462, -2.06076, 0.72723],
"rotation": [0, 0, -22.5],
"uv": {
"north": {"uv": [33, 2], "uv_size": [0.25, 0.25]},
"east": {"uv": [11, 26], "uv_size": [1.5, 0.25]},
"south": {"uv": [3, 33], "uv_size": [0.25, 0.25]},
"west": {"uv": [13, 26], "uv_size": [1.5, 0.25]},
"up": {"uv": [15, 26], "uv_size": [0.25, 1.5]}
}
}
]
},
{ {
"name": "body", "name": "body",
"parent": "gun", "parent": "gun",
@ -1459,172 +1619,6 @@
} }
] ]
}, },
{
"name": "magazine",
"parent": "body",
"pivot": [0, -0.3, 1.8]
},
{
"name": "bullet",
"parent": "magazine",
"pivot": [0, 2.04506, 1.58179],
"cubes": [
{
"origin": [-0.26066, 1.7844, 1.37382],
"size": [0.52132, 0.52132, 0.87264],
"uv": {
"north": {"uv": [29, 18], "uv_size": [0.5, 0.5]},
"east": {"uv": [27, 3], "uv_size": [0.75, 0.5]},
"south": {"uv": [19, 29], "uv_size": [0.5, 0.5]},
"west": {"uv": [4, 27], "uv_size": [0.75, 0.5]},
"up": {"uv": [27, 4], "uv_size": [0.5, 0.75]},
"down": {"uv": [5, 27.75], "uv_size": [0.5, -0.75]}
}
},
{
"origin": [-0.22434, 1.82073, 0.92637],
"size": [0.44867, 0.44867, 1.44011],
"uv": {
"north": {"uv": [29, 19], "uv_size": [0.5, 0.5]},
"east": {"uv": [5, 21], "uv_size": [1.5, 0.5]},
"south": {"uv": [20, 29], "uv_size": [0.5, 0.5]},
"west": {"uv": [7, 21], "uv_size": [1.5, 0.5]},
"up": {"uv": [1, 21], "uv_size": [0.5, 1.5]},
"down": {"uv": [21, 12.5], "uv_size": [0.5, -1.5]}
}
},
{
"origin": [-0.26066, 1.7844, 2.329],
"size": [0.52132, 0.52132, 0.13453],
"uv": {
"north": {"uv": [29, 20], "uv_size": [0.5, 0.5]},
"east": {"uv": [32, 4], "uv_size": [0.25, 0.5]},
"south": {"uv": [21, 29], "uv_size": [0.5, 0.5]},
"west": {"uv": [5, 32], "uv_size": [0.25, 0.5]},
"up": {"uv": [32, 5], "uv_size": [0.5, 0.25]},
"down": {"uv": [6, 32.25], "uv_size": [0.5, -0.25]}
}
}
]
},
{
"name": "mag",
"parent": "magazine",
"pivot": [0.24823, -5.38367, 0.94374],
"cubes": [
{
"origin": [-0.625, -3.29687, 2.66311],
"size": [1.25, 0.21875, 1.95],
"uv": {
"east": {"uv": [20, 24], "uv_size": [2, 0.25]},
"south": {"uv": [27, 10], "uv_size": [1.25, 0.25]},
"west": {"uv": [24, 20], "uv_size": [2, 0.25]},
"up": {"uv": [8, 14], "uv_size": [1.25, 2]},
"down": {"uv": [14, 10], "uv_size": [1.25, -2]}
}
},
{
"origin": [-0.5, -3.07812, 3.36311],
"size": [1, 0.21875, 0.75],
"uv": {
"east": {"uv": [30, 2], "uv_size": [0.75, 0.25]},
"west": {"uv": [3, 30], "uv_size": [0.75, 0.25]}
}
},
{
"origin": [-0.475, -3.29687, 2.51311],
"size": [0.95, 0.21875, 0.15],
"uv": {
"north": {"uv": [28, 28], "uv_size": [1, 0.25]},
"up": {"uv": [0, 29], "uv_size": [1, 0.25]},
"down": {"uv": [29, 0.25], "uv_size": [1, -0.25]}
}
},
{
"origin": [1.63218, -3.29687, 1.77338],
"size": [0.21293, 0.21875, 0.10938],
"pivot": [0.16105, -2.05902, 0.74544],
"rotation": [0, -45, 0],
"uv": {
"north": {"uv": [0, 33], "uv_size": [0.25, 0.25]},
"up": {"uv": [33, 0], "uv_size": [0.25, 0.25]},
"down": {"uv": [1, 33.25], "uv_size": [0.25, -0.25]}
}
},
{
"origin": [-1.84511, -3.29687, 1.77338],
"size": [0.21293, 0.21875, 0.10938],
"pivot": [-0.16105, -2.05902, 0.74544],
"rotation": [0, 45, 0],
"uv": {
"north": {"uv": [35, 24], "uv_size": [0.25, 0.25]},
"up": {"uv": [25, 35], "uv_size": [0.25, 0.25]},
"down": {"uv": [35, 25.25], "uv_size": [0.25, -0.25]}
}
},
{
"origin": [-0.5005, -4.49049, 3.36385],
"size": [1.001, 5.4385, 0.5635],
"pivot": [0.06161, -2.05902, 0.721],
"rotation": [22.5, 0, 0],
"uv": {
"north": {"uv": [6, 10], "uv_size": [1, 5.5]},
"east": {"uv": [13, 11], "uv_size": [0.5, 5.5]},
"south": {"uv": [7, 10], "uv_size": [1, 5.5]},
"west": {"uv": [0, 14], "uv_size": [0.5, 5.5]}
}
},
{
"origin": [-0.5005, -4.02174, 2.22635],
"size": [1.001, 5.19397, 1.1385],
"pivot": [0.06161, -2.05902, 0.721],
"rotation": [22.5, 0, 0],
"uv": {
"north": {"uv": [12, 0], "uv_size": [1, 5.25]},
"east": {"uv": [6, 4], "uv_size": [1.25, 5.25]},
"west": {"uv": [0, 8], "uv_size": [1.25, 5.25]},
"up": {"uv": [13, 17], "uv_size": [1, 1.25]},
"down": {"uv": [17, 16.25], "uv_size": [1, -1.25]}
}
},
{
"origin": [-0.4995, 1.50233, 0.87522],
"size": [1, 0.44141, 1.66328],
"uv": {
"north": {"uv": [24, 21], "uv_size": [1, 0.5]},
"east": {"uv": [20, 2], "uv_size": [1.75, 0.5]},
"west": {"uv": [3, 20], "uv_size": [1.75, 0.5]},
"up": {"uv": [16, 0], "uv_size": [1, 1.75]}
}
},
{
"origin": [-1.99396, 1.44791, 1.1635],
"size": [0.125, 0.25, 1.375],
"pivot": [-0.00039, -2.06076, 0.72723],
"rotation": [0, 0, 22.5],
"uv": {
"north": {"uv": [33, 1], "uv_size": [0.25, 0.25]},
"east": {"uv": [26, 8], "uv_size": [1.5, 0.25]},
"south": {"uv": [2, 33], "uv_size": [0.25, 0.25]},
"west": {"uv": [26, 9], "uv_size": [1.5, 0.25]},
"up": {"uv": [10, 26], "uv_size": [0.25, 1.5]}
}
},
{
"origin": [1.87934, 1.49507, 1.1635],
"size": [0.125, 0.25, 1.375],
"pivot": [0.12462, -2.06076, 0.72723],
"rotation": [0, 0, -22.5],
"uv": {
"north": {"uv": [33, 2], "uv_size": [0.25, 0.25]},
"east": {"uv": [11, 26], "uv_size": [1.5, 0.25]},
"south": {"uv": [3, 33], "uv_size": [0.25, 0.25]},
"west": {"uv": [13, 26], "uv_size": [1.5, 0.25]},
"up": {"uv": [15, 26], "uv_size": [0.25, 1.5]}
}
}
]
},
{ {
"name": "huatao", "name": "huatao",
"parent": "body", "parent": "body",
@ -2686,6 +2680,12 @@
} }
} }
] ]
},
{
"name": "roll",
"parent": "0",
"pivot": [0, 0, 0],
"rotation": [0, 0, 11]
} }
] ]
} }

View file

@ -34,14 +34,9 @@
"parent": "shen", "parent": "shen",
"pivot": [0, 0, 0] "pivot": [0, 0, 0]
}, },
{
"name": "roll",
"parent": "0",
"pivot": [0, 0, 0]
},
{ {
"name": "gun", "name": "gun",
"parent": "roll", "parent": "0",
"pivot": [0, 0.46563, 1.72795] "pivot": [0, 0.46563, 1.72795]
}, },
{ {
@ -58,6 +53,211 @@
} }
] ]
}, },
{
"name": "magazine",
"parent": "gun",
"pivot": [0, -0.3, 1.8]
},
{
"name": "Lefthand",
"parent": "magazine",
"pivot": [2.6976, -5.69887, 9.77824],
"rotation": [113.29762, -12.57035, 179.33701],
"cubes": [
{
"origin": [0.6476, -5.69887, 7.82824],
"size": [4, 12, 4],
"uv": {
"north": {"uv": [0, 36], "uv_size": [1, 1]},
"east": {"uv": [0, 36], "uv_size": [1, 1]},
"south": {"uv": [0, 36], "uv_size": [1, 1]},
"west": {"uv": [0, 36], "uv_size": [1, 1]},
"up": {"uv": [1, 37], "uv_size": [-1, -1]},
"down": {"uv": [1, 37], "uv_size": [-1, -1]}
}
}
]
},
{
"name": "bullet",
"parent": "magazine",
"pivot": [0, 2.04506, 1.95095],
"cubes": [
{
"origin": [-0.26066, 1.7844, 1.37382],
"size": [0.52132, 0.52132, 0.87264],
"uv": {
"north": {"uv": [17, 28], "uv_size": [0.5, 0.5]},
"east": {"uv": [10, 27], "uv_size": [0.75, 0.5]},
"south": {"uv": [28, 17], "uv_size": [0.5, 0.5]},
"west": {"uv": [12, 27], "uv_size": [0.75, 0.5]},
"up": {"uv": [27, 13], "uv_size": [0.5, 0.75]}
}
},
{
"origin": [-0.22434, 1.82073, 0.92637],
"size": [0.44867, 0.44867, 1.44011],
"uv": {
"north": {"uv": [18, 28], "uv_size": [0.5, 0.5]},
"east": {"uv": [22, 18], "uv_size": [1.5, 0.5]},
"south": {"uv": [28, 18], "uv_size": [0.5, 0.5]},
"west": {"uv": [22, 19], "uv_size": [1.5, 0.5]},
"up": {"uv": [20, 22], "uv_size": [0.5, 1.5]}
}
},
{
"origin": [-0.26066, 1.7844, 2.329],
"size": [0.52132, 0.52132, 0.13453],
"uv": {
"north": {"uv": [19, 28], "uv_size": [0.5, 0.5]},
"east": {"uv": [32, 22], "uv_size": [0.25, 0.5]},
"south": {"uv": [28, 19], "uv_size": [0.5, 0.5]},
"west": {"uv": [23, 32], "uv_size": [0.25, 0.5]},
"up": {"uv": [32, 23], "uv_size": [0.5, 0.25]}
}
}
]
},
{
"name": "mag",
"parent": "magazine",
"pivot": [0.24823, -5.38367, 0.94374],
"cubes": [
{
"origin": [-0.37525, -3.07812, 2.66311],
"size": [0.75, 0.41875, 1.45],
"pivot": [0.08636, -1.84027, 0.721],
"rotation": [3, 0, 0],
"uv": {
"east": {"uv": [22, 16], "uv_size": [1.5, 0.5]},
"west": {"uv": [22, 17], "uv_size": [1.5, 0.5]}
}
},
{
"origin": [-0.37475, -3.10462, 2.9737],
"size": [0.75, 5.1385, 0.5635],
"pivot": [0.02475, -0.53537, 3.25545],
"rotation": [22.5, 0, 0],
"uv": {
"north": {"uv": [5, 5], "uv_size": [0.75, 5.25]},
"east": {"uv": [1, 10], "uv_size": [0.5, 5.25]},
"south": {"uv": [6, 0], "uv_size": [0.75, 5.25]},
"west": {"uv": [2, 10], "uv_size": [0.5, 5.25]}
}
},
{
"origin": [-0.37475, -3.04411, 3.84589],
"size": [0.75, 0.1385, 0.2635],
"pivot": [0.02475, -1.07486, 3.82764],
"rotation": [12.5, 0, 0],
"uv": {
"north": {"uv": [32, 11], "uv_size": [0.75, 0.25]},
"east": {"uv": [1, 39], "uv_size": [0.25, 0.25]},
"south": {"uv": [12, 32], "uv_size": [0.75, 0.25]},
"west": {"uv": [39, 1], "uv_size": [0.25, 0.25]}
}
},
{
"origin": [-0.37475, -3.72175, 2.22635],
"size": [0.75, 4.89397, 1.1385],
"pivot": [0.08636, -2.05902, 0.721],
"rotation": [22.5, 0, 0],
"uv": {
"north": {"uv": [6, 6], "uv_size": [0.75, 5]},
"east": {"uv": [0, 0], "uv_size": [1.25, 5]},
"west": {"uv": [2, 0], "uv_size": [1.25, 5]},
"up": {"uv": [22, 3], "uv_size": [0.75, 1.25]},
"down": {"uv": [5, 23.25], "uv_size": [0.75, -1.25]}
}
},
{
"origin": [-0.375, 1.50233, 0.87522],
"size": [0.75, 0.44141, 1.66328],
"uv": {
"north": {"uv": [27, 2], "uv_size": [0.75, 0.5]},
"east": {"uv": [11, 22], "uv_size": [1.75, 0.5]},
"west": {"uv": [22, 12], "uv_size": [1.75, 0.5]},
"up": {"uv": [7, 17], "uv_size": [0.75, 1.75]}
}
},
{
"origin": [-1.86921, 1.4503, 1.15754],
"size": [0.125, 0.25, 1.375],
"pivot": [0.12436, -2.05837, 0.72128],
"rotation": [0, 0, 22.5],
"uv": {
"north": {"uv": [34, 13], "uv_size": [0.25, 0.25]},
"east": {"uv": [27, 3], "uv_size": [1.5, 0.25]},
"south": {"uv": [14, 34], "uv_size": [0.25, 0.25]},
"west": {"uv": [27, 4], "uv_size": [1.5, 0.25]},
"up": {"uv": [3, 27], "uv_size": [0.25, 1.5]}
}
},
{
"origin": [1.75409, 1.49746, 1.15754],
"size": [0.125, 0.25, 1.375],
"pivot": [-0.00063, -2.05837, 0.72128],
"rotation": [0, 0, -22.5],
"uv": {
"north": {"uv": [34, 14], "uv_size": [0.25, 0.25]},
"east": {"uv": [27, 5], "uv_size": [1.5, 0.25]},
"south": {"uv": [15, 34], "uv_size": [0.25, 0.25]},
"west": {"uv": [27, 6], "uv_size": [1.5, 0.25]},
"up": {"uv": [27, 8], "uv_size": [0.25, 1.5]}
}
}
]
},
{
"name": "bone8",
"parent": "mag",
"pivot": [0, -3.0875, 2.57009],
"rotation": [3, 0, 0],
"cubes": [
{
"origin": [-0.375, -3.12812, 2.36311],
"size": [0.75, 0.15, 2.23203],
"uv": {
"east": {"uv": [14, 25], "uv_size": [2.25, 0.25]},
"south": {"uv": [31, 1], "uv_size": [0.75, 0.25]},
"west": {"uv": [25, 21], "uv_size": [2.25, 0.25]},
"up": {"uv": [7, 14], "uv_size": [0.75, 2.25]},
"down": {"uv": [14, 9.25], "uv_size": [0.75, -2.25]}
}
},
{
"origin": [-0.225, -3.12812, 2.21311],
"size": [0.45, 0.15, 0.15],
"uv": {
"north": {"uv": [17, 32], "uv_size": [0.5, 0.25]},
"up": {"uv": [32, 17], "uv_size": [0.5, 0.25]},
"down": {"uv": [18, 32.25], "uv_size": [0.5, -0.25]}
}
},
{
"origin": [1.38274, -3.12812, 1.47394],
"size": [0.21293, 0.15, 0.10938],
"pivot": [-0.08839, -1.95902, 0.446],
"rotation": [0, -45, 0],
"uv": {
"north": {"uv": [12, 34], "uv_size": [0.25, 0.25]},
"up": {"uv": [34, 12], "uv_size": [0.25, 0.25]},
"down": {"uv": [13, 34.25], "uv_size": [0.25, -0.25]}
}
},
{
"origin": [-1.59567, -3.12812, 1.47394],
"size": [0.21293, 0.15, 0.10938],
"pivot": [0.08839, -1.95902, 0.446],
"rotation": [0, 45, 0],
"uv": {
"north": {"uv": [18, 34], "uv_size": [0.25, 0.25]},
"up": {"uv": [34, 18], "uv_size": [0.25, 0.25]},
"down": {"uv": [19, 34.25], "uv_size": [0.25, -0.25]}
}
}
]
},
{ {
"name": "body", "name": "body",
"parent": "gun", "parent": "gun",
@ -553,8 +753,6 @@
{ {
"origin": [-0.262, 0.41813, -1.3058], "origin": [-0.262, 0.41813, -1.3058],
"size": [0.524, 0.69275, 0.1], "size": [0.524, 0.69275, 0.1],
"pivot": [0, 0.7395, -1.2558],
"rotation": [0, 0, 0],
"uv": { "uv": {
"north": {"uv": [14, 27], "uv_size": [0.5, 0.75]}, "north": {"uv": [14, 27], "uv_size": [0.5, 0.75]},
"east": {"uv": [2, 31], "uv_size": [0.25, 0.75]}, "east": {"uv": [2, 31], "uv_size": [0.25, 0.75]},
@ -686,8 +884,6 @@
{ {
"origin": [-0.46925, 0.23029, 0.928], "origin": [-0.46925, 0.23029, 0.928],
"size": [0.9385, 0.501, 0.19241], "size": [0.9385, 0.501, 0.19241],
"pivot": [0, 0.43079, 1.04921],
"rotation": [0, 0, 0],
"uv": { "uv": {
"north": {"uv": [26, 1], "uv_size": [1, 0.5]}, "north": {"uv": [26, 1], "uv_size": [1, 0.5]},
"east": {"uv": [3, 33], "uv_size": [0.25, 0.5]}, "east": {"uv": [3, 33], "uv_size": [0.25, 0.5]},
@ -697,8 +893,6 @@
{ {
"origin": [-0.46925, -0.16813, 0.80108], "origin": [-0.46925, -0.16813, 0.80108],
"size": [0.9385, 0.31272, 0.44241], "size": [0.9385, 0.31272, 0.44241],
"pivot": [0, -0.05591, 1.02229],
"rotation": [0, 0, 0],
"uv": { "uv": {
"north": {"uv": [22, 28], "uv_size": [1, 0.25]}, "north": {"uv": [22, 28], "uv_size": [1, 0.25]},
"east": {"uv": [32, 32], "uv_size": [0.5, 0.25]}, "east": {"uv": [32, 32], "uv_size": [0.5, 0.25]},
@ -1644,191 +1838,6 @@
} }
] ]
}, },
{
"name": "magazine",
"parent": "body",
"pivot": [0, -0.3, 1.8]
},
{
"name": "bullet",
"parent": "magazine",
"pivot": [0, 2.04506, 1.95095],
"cubes": [
{
"origin": [-0.26066, 1.7844, 1.37382],
"size": [0.52132, 0.52132, 0.87264],
"uv": {
"north": {"uv": [17, 28], "uv_size": [0.5, 0.5]},
"east": {"uv": [10, 27], "uv_size": [0.75, 0.5]},
"south": {"uv": [28, 17], "uv_size": [0.5, 0.5]},
"west": {"uv": [12, 27], "uv_size": [0.75, 0.5]},
"up": {"uv": [27, 13], "uv_size": [0.5, 0.75]}
}
},
{
"origin": [-0.22434, 1.82073, 0.92637],
"size": [0.44867, 0.44867, 1.44011],
"uv": {
"north": {"uv": [18, 28], "uv_size": [0.5, 0.5]},
"east": {"uv": [22, 18], "uv_size": [1.5, 0.5]},
"south": {"uv": [28, 18], "uv_size": [0.5, 0.5]},
"west": {"uv": [22, 19], "uv_size": [1.5, 0.5]},
"up": {"uv": [20, 22], "uv_size": [0.5, 1.5]}
}
},
{
"origin": [-0.26066, 1.7844, 2.329],
"size": [0.52132, 0.52132, 0.13453],
"uv": {
"north": {"uv": [19, 28], "uv_size": [0.5, 0.5]},
"east": {"uv": [32, 22], "uv_size": [0.25, 0.5]},
"south": {"uv": [28, 19], "uv_size": [0.5, 0.5]},
"west": {"uv": [23, 32], "uv_size": [0.25, 0.5]},
"up": {"uv": [32, 23], "uv_size": [0.5, 0.25]}
}
}
]
},
{
"name": "mag",
"parent": "magazine",
"pivot": [0.24823, -5.38367, 0.94374],
"cubes": [
{
"origin": [-0.37525, -3.07812, 2.66311],
"size": [0.75, 0.41875, 1.45],
"pivot": [0.08636, -1.84027, 0.721],
"rotation": [3, 0, 0],
"uv": {
"east": {"uv": [22, 16], "uv_size": [1.5, 0.5]},
"west": {"uv": [22, 17], "uv_size": [1.5, 0.5]}
}
},
{
"origin": [-0.37475, -3.10462, 2.9737],
"size": [0.75, 5.1385, 0.5635],
"pivot": [0.02475, -0.53537, 3.25545],
"rotation": [22.5, 0, 0],
"uv": {
"north": {"uv": [5, 5], "uv_size": [0.75, 5.25]},
"east": {"uv": [1, 10], "uv_size": [0.5, 5.25]},
"south": {"uv": [6, 0], "uv_size": [0.75, 5.25]},
"west": {"uv": [2, 10], "uv_size": [0.5, 5.25]}
}
},
{
"origin": [-0.37475, -3.04411, 3.84589],
"size": [0.75, 0.1385, 0.2635],
"pivot": [0.02475, -1.07486, 3.82764],
"rotation": [12.5, 0, 0],
"uv": {
"north": {"uv": [32, 11], "uv_size": [0.75, 0.25]},
"east": {"uv": [1, 39], "uv_size": [0.25, 0.25]},
"south": {"uv": [12, 32], "uv_size": [0.75, 0.25]},
"west": {"uv": [39, 1], "uv_size": [0.25, 0.25]}
}
},
{
"origin": [-0.37475, -3.72175, 2.22635],
"size": [0.75, 4.89397, 1.1385],
"pivot": [0.08636, -2.05902, 0.721],
"rotation": [22.5, 0, 0],
"uv": {
"north": {"uv": [6, 6], "uv_size": [0.75, 5]},
"east": {"uv": [0, 0], "uv_size": [1.25, 5]},
"west": {"uv": [2, 0], "uv_size": [1.25, 5]},
"up": {"uv": [22, 3], "uv_size": [0.75, 1.25]},
"down": {"uv": [5, 23.25], "uv_size": [0.75, -1.25]}
}
},
{
"origin": [-0.375, 1.50233, 0.87522],
"size": [0.75, 0.44141, 1.66328],
"uv": {
"north": {"uv": [27, 2], "uv_size": [0.75, 0.5]},
"east": {"uv": [11, 22], "uv_size": [1.75, 0.5]},
"west": {"uv": [22, 12], "uv_size": [1.75, 0.5]},
"up": {"uv": [7, 17], "uv_size": [0.75, 1.75]}
}
},
{
"origin": [-1.86921, 1.4503, 1.15754],
"size": [0.125, 0.25, 1.375],
"pivot": [0.12436, -2.05837, 0.72128],
"rotation": [0, 0, 22.5],
"uv": {
"north": {"uv": [34, 13], "uv_size": [0.25, 0.25]},
"east": {"uv": [27, 3], "uv_size": [1.5, 0.25]},
"south": {"uv": [14, 34], "uv_size": [0.25, 0.25]},
"west": {"uv": [27, 4], "uv_size": [1.5, 0.25]},
"up": {"uv": [3, 27], "uv_size": [0.25, 1.5]}
}
},
{
"origin": [1.75409, 1.49746, 1.15754],
"size": [0.125, 0.25, 1.375],
"pivot": [-0.00063, -2.05837, 0.72128],
"rotation": [0, 0, -22.5],
"uv": {
"north": {"uv": [34, 14], "uv_size": [0.25, 0.25]},
"east": {"uv": [27, 5], "uv_size": [1.5, 0.25]},
"south": {"uv": [15, 34], "uv_size": [0.25, 0.25]},
"west": {"uv": [27, 6], "uv_size": [1.5, 0.25]},
"up": {"uv": [27, 8], "uv_size": [0.25, 1.5]}
}
}
]
},
{
"name": "bone8",
"parent": "mag",
"pivot": [0, -3.0875, 2.57009],
"rotation": [3, 0, 0],
"cubes": [
{
"origin": [-0.375, -3.12812, 2.36311],
"size": [0.75, 0.15, 2.23203],
"uv": {
"east": {"uv": [14, 25], "uv_size": [2.25, 0.25]},
"south": {"uv": [31, 1], "uv_size": [0.75, 0.25]},
"west": {"uv": [25, 21], "uv_size": [2.25, 0.25]},
"up": {"uv": [7, 14], "uv_size": [0.75, 2.25]},
"down": {"uv": [14, 9.25], "uv_size": [0.75, -2.25]}
}
},
{
"origin": [-0.225, -3.12812, 2.21311],
"size": [0.45, 0.15, 0.15],
"uv": {
"north": {"uv": [17, 32], "uv_size": [0.5, 0.25]},
"up": {"uv": [32, 17], "uv_size": [0.5, 0.25]},
"down": {"uv": [18, 32.25], "uv_size": [0.5, -0.25]}
}
},
{
"origin": [1.38274, -3.12812, 1.47394],
"size": [0.21293, 0.15, 0.10938],
"pivot": [-0.08839, -1.95902, 0.446],
"rotation": [0, -45, 0],
"uv": {
"north": {"uv": [12, 34], "uv_size": [0.25, 0.25]},
"up": {"uv": [34, 12], "uv_size": [0.25, 0.25]},
"down": {"uv": [13, 34.25], "uv_size": [0.25, -0.25]}
}
},
{
"origin": [-1.59567, -3.12812, 1.47394],
"size": [0.21293, 0.15, 0.10938],
"pivot": [0.08839, -1.95902, 0.446],
"rotation": [0, 45, 0],
"uv": {
"north": {"uv": [18, 34], "uv_size": [0.25, 0.25]},
"up": {"uv": [34, 18], "uv_size": [0.25, 0.25]},
"down": {"uv": [19, 34.25], "uv_size": [0.25, -0.25]}
}
}
]
},
{ {
"name": "huatao", "name": "huatao",
"parent": "body", "parent": "body",
@ -3262,26 +3271,6 @@
} }
} }
] ]
},
{
"name": "Lefthand",
"parent": "roll",
"pivot": [2.6976, -5.69887, 9.77824],
"rotation": [113.29762, -12.57035, 179.33701],
"cubes": [
{
"origin": [0.6476, -5.69887, 7.82824],
"size": [4, 12, 4],
"uv": {
"north": {"uv": [0, 36], "uv_size": [1, 1]},
"east": {"uv": [0, 36], "uv_size": [1, 1]},
"south": {"uv": [0, 36], "uv_size": [1, 1]},
"west": {"uv": [0, 36], "uv_size": [1, 1]},
"up": {"uv": [1, 37], "uv_size": [-1, -1]},
"down": {"uv": [1, 37], "uv_size": [-1, -1]}
}
}
]
} }
] ]
} }

View file

@ -33,9 +33,9 @@
}, },
"firstperson_righthand": { "firstperson_righthand": {
"translation": [ "translation": [
-8.25, -6.75,
1.25, 1.75,
-2.75 -2.5
] ]
}, },
"firstperson_lefthand": { "firstperson_lefthand": {

View file

@ -33,14 +33,9 @@
}, },
"firstperson_righthand": { "firstperson_righthand": {
"translation": [ "translation": [
-7, -6.75,
3.25, 2.75,
0.75 -1.25
],
"scale": [
1.05,
1.05,
1.05
] ]
}, },
"firstperson_lefthand": { "firstperson_lefthand": {

View file

@ -1,5 +1,5 @@
{ {
"parent": "superbwarfare:displaysettings/m1911.item", "parent": "superbwarfare:displaysettings/glock17.item",
"textures": { "textures": {
"layer0": "superbwarfare:item/m1911" "layer0": "superbwarfare:item/m1911"
} }

View file

@ -7,8 +7,8 @@
"Velocity": 17, "Velocity": 17,
"Magazine": 17, "Magazine": 17,
"Weight": 1, "Weight": 1,
"NormalReloadTime": 30, "NormalReloadTime": 44,
"EmptyReloadTime": 35, "EmptyReloadTime": 47,
"BypassesArmor": 0.15, "BypassesArmor": 0.15,
"SoundRadius": 8, "SoundRadius": 8,
"RPM": 400 "RPM": 400

View file

@ -8,8 +8,8 @@
"Magazine": 17, "Magazine": 17,
"Weight": 1, "Weight": 1,
"FireMode": 2, "FireMode": 2,
"NormalReloadTime": 30, "NormalReloadTime": 44,
"EmptyReloadTime": 35, "EmptyReloadTime": 47,
"BypassesArmor": 0.15, "BypassesArmor": 0.15,
"SoundRadius": 8, "SoundRadius": 8,
"RPM": 1300 "RPM": 1300

View file

@ -7,8 +7,8 @@
"Velocity": 15, "Velocity": 15,
"Magazine": 7, "Magazine": 7,
"Weight": 2, "Weight": 2,
"NormalReloadTime": 30, "NormalReloadTime": 44,
"EmptyReloadTime": 35, "EmptyReloadTime": 47,
"BypassesArmor": 0.2, "BypassesArmor": 0.2,
"SoundRadius": 10, "SoundRadius": 10,
"RPM": 400 "RPM": 400