重制AA12模型,贴图,动画,优化部分武器贴图

This commit is contained in:
Atsuihsio 2024-05-12 23:32:17 +08:00
parent 22eb461697
commit 61ce954500
17 changed files with 5335 additions and 7907 deletions

View file

@ -41,12 +41,14 @@ public class Aa12ItemModel extends GeoModel<Aa12Item> {
gun.setPosX(8.863f * (float) p); gun.setPosX(8.863f * (float) p);
gun.setPosY(0.98f * (float) p - (float) (1.2f * zp)); gun.setPosY(-0.88f * (float) p - (float) (1.2f * zp));
gun.setPosZ((float) p + (float) (1.3f * zp)); gun.setPosZ((float) p + (float) (3.3f * zp));
gun.setRotZ((float) (0.02f * zp)); gun.setRotZ((float) (0.02f * zp));
gun.setScaleZ(1f - (0.4f * (float) p));
double fp = 0; double fp = 0;
fp = player.getPersistentData().getDouble("firepos"); fp = player.getPersistentData().getDouble("firepos");

View file

@ -18,7 +18,7 @@ public class Aa12WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
itemstack.getOrCreateTag().putDouble("reloadtime", 0); itemstack.getOrCreateTag().putDouble("reloadtime", 0);
} }
if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getDouble("ammo") == 0) { if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getDouble("ammo") == 0) {
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 52) { if (itemstack.getOrCreateTag().getDouble("reloadtime") == 55) {
entity.getPersistentData().putDouble("id", id); entity.getPersistentData().putDouble("id", id);
{ {
if (!entity.level().isClientSide() && entity.getServer() != null) { if (!entity.level().isClientSide() && entity.getServer() != null) {
@ -41,7 +41,7 @@ public class Aa12WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
GunReload.reload(entity, GunInfo.Type.SHOTGUN); GunReload.reload(entity, GunInfo.Type.SHOTGUN);
} }
} else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getDouble("ammo") > 0) { } else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getDouble("ammo") > 0) {
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 41) { if (itemstack.getOrCreateTag().getDouble("reloadtime") == 44) {
entity.getPersistentData().putDouble("id", id); entity.getPersistentData().putDouble("id", id);
{ {
if (!entity.level().isClientSide() && entity.getServer() != null) { if (!entity.level().isClientSide() && entity.getServer() != null) {

View file

@ -213,12 +213,12 @@ public class PlayerReloadProcedure {
tag.putDouble("reloading", 1); tag.putDouble("reloading", 1);
tag.putDouble("emptyreload", 0); tag.putDouble("emptyreload", 0);
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
tag.putDouble("reloadtime", 41); tag.putDouble("reloadtime", 44);
} else if (tag.getDouble("ammo") == 0) { } else if (tag.getDouble("ammo") == 0) {
tag.putDouble("reloading", 1); tag.putDouble("reloading", 1);
tag.putDouble("emptyreload", 1); tag.putDouble("emptyreload", 1);
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
tag.putDouble("reloadtime", 52); tag.putDouble("reloadtime", 55);
} }
} }
if (player.getMainHandItem().getItem() == TargetModItems.DEVOTION.get() if (player.getMainHandItem().getItem() == TargetModItems.DEVOTION.get()

View file

@ -96,7 +96,7 @@
}, },
"animation.aa12.run": { "animation.aa12.run": {
"loop": true, "loop": true,
"animation_length": 0.79167, "animation_length": 0.7917,
"bones": { "bones": {
"main": { "main": {
"rotation": { "rotation": {
@ -210,7 +210,7 @@
} }
}, },
"animation.aa12.reloadempty": { "animation.aa12.reloadempty": {
"animation_length": 2.6, "animation_length": 3,
"bones": { "bones": {
"main": { "main": {
"rotation": { "rotation": {
@ -218,67 +218,45 @@
"vector": [0, 0, 0] "vector": [0, 0, 0]
}, },
"0.2": { "0.2": {
"vector": [-5.49023, -1.8796, -12.66404] "vector": [-1.25, 0, -5.25],
"easing": "easeInOutCubic"
}, },
"0.2667": { "0.3": {
"vector": [-5.43961, -2.26481, -13.04653] "vector": [3, 0, -1]
}, },
"0.3667": { "0.4": {
"vector": [-6.01123, 1.6446, 0.27525] "vector": [2.75, 0, 2]
},
"0.4667": {
"vector": [-6.25386, -0.20302, -0.38654]
}, },
"0.6": { "0.6": {
"vector": [-6.11401, -0.24184, -2.94553] "vector": [-2, 0, -8]
},
"0.7333": {
"vector": [-5.88082, -1.70863, -9.32193]
},
"0.8333": {
"vector": [-5.88555, -2.3769, -11.32892]
}, },
"1.0": { "1.0": {
"vector": [-8.38541, -6.30024, -28.34712] "vector": [-5.04, -5, -31.25],
"easing": "easeInOutCubic"
}, },
"1.1333": { "1.2": {
"vector": [-7.93139, -9.11944, -33.07096] "vector": [-5.96, -5, -31.92]
}, },
"1.2667": { "1.4": {
"vector": [-9.07014, -7.63227, -28.74648] "vector": [-7.79, -5, -27.25]
}, },
"1.3667": { "1.5": {
"vector": [-6.70888, -8.74921, -39.37529] "vector": [-12.29, -4.5, -25.25]
},
"1.4667": {
"vector": [-6.39364, -8.89084, -33.51246]
}, },
"1.6": { "1.6": {
"vector": [-5.65568, -7.76862, -34.61714] "vector": [-6.27, -1.56, -20]
}, },
"1.7333": { "1.9": {
"vector": [-7.20418, -7.01312, -15.86592] "vector": [-1.25, -1.04, -1.92]
},
"1.8667": {
"vector": [-6.67748, -5.63479, -1.1373]
},
"1.9333": {
"vector": [-7.09312, -5.31551, -4.71251]
},
"2.0333": {
"vector": [-8.11186, -3.46711, 1.61687]
}, },
"2.1": { "2.1": {
"vector": [-7.78325, -4.58479, -2.78157] "vector": [-0.33, 1.04, 4.34]
}, },
"2.2": { "2.2": {
"vector": [-7.38162, -4.1107, 2.72722] "vector": [-1.26, 0.83, 3.47]
}, },
"2.3333": { "2.4": {
"vector": [-7.09873, -4.58348, -1.0036] "vector": [-1.63, 0.42, -2.26]
},
"2.4667": {
"vector": [-3.16351, -0.68674, 4.4336]
}, },
"2.6": { "2.6": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
@ -288,223 +266,53 @@
"0.0": { "0.0": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
}, },
"0.0667": { "0.2": {
"vector": [-0.575, -1, 0] "vector": [-1, 1.4, 0],
"easing": "easeInOutCubic"
}, },
"0.1333": { "0.3": {
"vector": [-1.075, -0.58, 0.14] "vector": [-1, -4.4, 0]
}, },
"0.2333": { "0.5": {
"vector": [-0.38, 1.05, 0.35] "vector": [-1, 1.00781, -0.45937]
}, },
"0.4": { "0.7": {
"vector": [-0.705, -2.775, -0.675] "vector": [-1, -0.175, 0.4]
},
"0.5333": {
"vector": [-0.975, -1.895, -1.475]
},
"0.6667": {
"vector": [-0.705, -1.375, -1.575]
},
"0.7667": {
"vector": [-0.365, -1.53, -2.165]
}, },
"0.9": { "0.9": {
"vector": [-0.55, -1.27, -3.6] "vector": [-1, -0.19, 0.4]
}, },
"1.0": { "1.0": {
"vector": [-0.655, -0.63, -2.29] "vector": [-1, -0.2, 0.4]
}, },
"1.0667": { "1.2": {
"vector": [-0.7, -0.55, -1.85] "vector": [-0.4, -0.01266, 0.4]
},
"1.1667": {
"vector": [-0.85, -0.45, -1.3]
},
"1.2333": {
"vector": [-1.025, -0.475, -1.3]
},
"1.3333": {
"vector": [-1.2, 0.925, -1.3]
}, },
"1.4": { "1.4": {
"vector": [-1.225, 0.35, -0.775] "vector": [-1.02, 1.16, -0.15]
}, },
"1.5": { "1.5": {
"vector": [-1.075, -0.225, -1.025] "vector": [-1.9, 3.18734, 0.4]
},
"1.6667": {
"vector": [-0.85, -1.33, 1.315]
},
"1.8": {
"vector": [-0.795, -3.38, 2.93]
},
"1.9333": {
"vector": [-0.565, -3.38, 3.605]
},
"2.0": {
"vector": [-0.72, -3.38, 5.755]
},
"2.0667": {
"vector": [-0.72, -3.38, 6.25]
},
"2.1667": {
"vector": [-0.645, -3.38, 4.125]
},
"2.2667": {
"vector": [-1.145, -3.38, 3.375]
},
"2.4333": {
"vector": [-1.05, -1.93, -1.57]
},
"2.5667": {
"vector": [0, 0, 0]
}
}
},
"leftarm": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.1333": {
"vector": [-2.52451, 2.51586, 4.87331]
},
"0.2": {
"vector": [-4.65535, 4.60961, 5.29626]
},
"0.3667": {
"vector": [-0.8331, 9.56604, 5.33355]
},
"0.5": {
"vector": [-0.8331, 9.56604, 5.33355]
},
"0.8333": {
"vector": [-0.8331, 9.56604, 5.33355]
},
"1.0333": {
"vector": [-0.90449, 6.26421, 1.57763]
},
"1.1": {
"vector": [-4.13382, 8.16291, 3.90739]
},
"1.1667": {
"vector": [-4.14952, 6.93448, 2.6609]
},
"1.2333": {
"vector": [-5.88777, 8.01958, 3.69662]
},
"1.3": {
"vector": [-12.90281, 5.18223, 7.50648]
},
"1.3667": {
"vector": [-24.05947, 7.3808, 13.72891]
},
"1.5667": {
"vector": [-24.34483, 14.54802, 14.95208]
},
"1.8": {
"vector": [-8.10376, -6.91926, -8.7822]
},
"1.8667": {
"vector": [-8.10376, -6.91926, -8.7822]
},
"1.9333": {
"vector": [-13.6899, -11.40308, -12.09663]
},
"2.0": {
"vector": [-22.02223, -7.64415, -10.02939]
},
"2.1": {
"vector": [-22.02223, -7.64415, -10.02939]
},
"2.1667": {
"vector": [-8.10376, -6.91926, -8.7822]
},
"2.2333": {
"vector": [-5.37697, -9.90089, -11.54618]
},
"2.5667": {
"vector": [0, 0, 0]
}
},
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"0.0667": {
"vector": [5.66, -4.79, 8.6]
},
"0.1333": {
"vector": [5.125, -8.7, 16.225]
},
"0.2": {
"vector": [5.85, -9.575, 17.2]
},
"0.3667": {
"vector": [6.38, -22.955, 17.2]
},
"0.5": {
"vector": [11.205, -43.26, 14.05]
},
"0.8333": {
"vector": [11.205, -43.26, 14.05]
},
"1.0333": {
"vector": [9.585, -22.51, 16.6]
},
"1.1": {
"vector": [7.355, -24.01, 15.05]
},
"1.1667": {
"vector": [6.66, -22.535, 15.05]
},
"1.2333": {
"vector": [6.835, -20.59, 15.05]
},
"1.3": {
"vector": [6.165, -20.165, 12.625]
},
"1.3667": {
"vector": [4.995, -11.86, 8.93]
},
"1.4667": {
"vector": [4.99, -11.1, 9.02]
},
"1.5667": {
"vector": [4.995, -8.935, 7.105]
}, },
"1.7": { "1.7": {
"vector": [10.68, -0.78, 8.33] "vector": [0.58, 0.21, 0.65]
}, },
"1.8": { "1.8": {
"vector": [4.165, 10.29, 7.73] "vector": [0.76, 1.15, 2.27]
},
"1.8667": {
"vector": [4.165, 10.29, 7.73]
},
"1.9333": {
"vector": [5.335, 9.315, 9.53]
}, },
"2.0": { "2.0": {
"vector": [5.755, 8.07, 20.23] "vector": [-0.29, 0.56, 4.73]
}, },
"2.1": { "2.1": {
"vector": [5.755, 8.07, 20.23] "vector": [-0.29, 0.56, 6.73]
}, },
"2.1667": { "2.2": {
"vector": [4.165, 10.29, 7.73] "vector": [-0.23, 0.45, -0.62]
}, },
"2.2333": { "2.4": {
"vector": [3.265, 9.39, 7.73] "vector": [-0.12, 0.53, 0.69]
}, },
"2.3667": { "2.6": {
"vector": [7.93, 1.23, 9.67]
},
"2.4667": {
"vector": [5.77, 0.62, 4.84]
},
"2.5667": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
} }
} }
@ -514,10 +322,10 @@
"0.0": { "0.0": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
}, },
"1.8667": { "1.9": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
}, },
"2.1667": { "2.2": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
} }
}, },
@ -525,88 +333,16 @@
"0.0": { "0.0": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
}, },
"1.8667": { "1.9": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
}, },
"1.9333": {
"vector": [0, 0, 3.7]
},
"2.0": { "2.0": {
"vector": [0, 0, 14.1] "vector": [0, 0, 14.1]
}, },
"2.1": { "2.1": {
"vector": [0, 0, 14.1] "vector": [0, 0, 14.1]
}, },
"2.1667": { "2.2": {
"vector": [0, 0, 0]
}
}
},
"magazine": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.2": {
"vector": [0, 0, 0]
},
"0.3667": {
"vector": [0, 0, 0]
},
"0.5": {
"vector": [-7.13393, -4.72045, -10.26812]
},
"0.8333": {
"vector": [-7.13393, -4.72045, -10.26812]
},
"1.0333": {
"vector": [-2.18265, -10.62035, -13.41879]
},
"1.1": {
"vector": [-1.22936, -2.76749, -1.26655]
},
"1.1667": {
"vector": [0.4684, -6.5091, -1.62015]
},
"1.2333": {
"vector": [0, 0, 0]
},
"1.3667": {
"vector": [0, 0, 0]
}
},
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"0.2": {
"vector": [0, 0, 0]
},
"0.3667": {
"vector": [0, -14.975, -0.525]
},
"0.5": {
"vector": [6.8, -31.28, -2.97]
},
"0.8333": {
"vector": [6.8, -31.28, -2.97]
},
"1.0333": {
"vector": [6.15, -15.8, -2.2]
},
"1.1": {
"vector": [0.765, -15.37, -1.305]
},
"1.1667": {
"vector": [0.62, -14.645, -1.335]
},
"1.2333": {
"vector": [0, -12.25, -0.525]
},
"1.3": {
"vector": [0, -10.005, -0.52]
},
"1.3667": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
} }
} }
@ -616,16 +352,31 @@
"0.0": { "0.0": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
}, },
"0.1": {
"vector": [-6, 10, -7]
},
"1.5": {
"vector": [-6, 10, -7]
},
"1.6": {
"vector": [-6, 10, -7]
},
"1.7": { "1.7": {
"vector": [0, 0, 0] "vector": [1.33, 8.5, 20.67]
}, },
"1.8333": { "1.9": {
"vector": [0, 0, -5] "vector": [-25.25, -6.75, -24.25]
}, },
"2.2": { "2.0": {
"vector": [0, 0, 5] "vector": [-46.25, -24.75, -30.25]
}, },
"2.5333": { "2.1": {
"vector": [-46.25, -24.75, -30.25]
},
"2.3": {
"vector": [-17.75, -14.75, -11.25]
},
"2.6": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
} }
}, },
@ -633,33 +384,80 @@
"0.0": { "0.0": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
}, },
"1.7": { "0.1": {
"vector": [0, 0, 0] "vector": [14.4, -2.6, 18.1]
}, },
"1.8333": { "1.5": {
"vector": [5, 4, 1.1] "vector": [14.4, -2.6, 18.1]
},
"1.6": {
"vector": [13.8, -5.6, 21.1]
},
"1.9": {
"vector": [12.91406, 15.23828, 5.35547]
}, },
"2.0": { "2.0": {
"vector": [3.81, 3.05, -4], "vector": [16.01406, 15.23828, 13.55547]
"easing": "easeInSine"
}, },
"2.2": { "2.1": {
"vector": [5, 4, 1.1] "vector": [16.01406, 15.23828, 13.55547]
}, },
"2.5333": { "2.4": {
"vector": [9.86, 5.64, 9.46]
},
"2.6": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
} }
} }
},
"magazine": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.2": {
"vector": [0, 0, 0]
},
"0.5": {
"vector": [-7.5, -7.5, 0]
},
"1.0": {
"vector": [-10.18265, -10.62035, -13.41879]
},
"1.1": {
"vector": [-1.22936, -2.76749, -1.26655]
},
"1.4": {
"vector": [0, 0, 0],
"easing": "easeInQuart"
} }
}, },
"sound_effects": { "position": {
"0.0": { "0.0": {
"effect": "ouch" "vector": [0, 0, 0]
},
"0.2": {
"vector": [0, 0, 0]
},
"0.5": {
"vector": [1.7, -30, -2]
},
"1.0": {
"vector": [3.55, -15.8, -2.2]
},
"1.1": {
"vector": [0.765, -15.37, -1.305]
},
"1.4": {
"vector": [0, 0, 0],
"easing": "easeInQuart"
}
}
} }
} }
}, },
"animation.aa12.reload": { "animation.aa12.reload": {
"animation_length": 1.9667, "animation_length": 2.4,
"bones": { "bones": {
"main": { "main": {
"rotation": { "rotation": {
@ -667,153 +465,38 @@
"vector": [0, 0, 0] "vector": [0, 0, 0]
}, },
"0.2": { "0.2": {
"vector": [-5.49023, -1.8796, -12.66404] "vector": [-1.25, 0, -5.25],
"easing": "easeInOutCubic"
}, },
"0.2667": { "0.3": {
"vector": [-5.43961, -2.26481, -13.04653] "vector": [3, 0, -1]
},
"0.3667": {
"vector": [-6.01123, 1.6446, 0.27525]
},
"0.4667": {
"vector": [-6.25386, -0.20302, -0.38654]
},
"0.6": {
"vector": [-6.11401, -0.24184, -2.94553]
},
"0.7333": {
"vector": [-5.88082, -1.70863, -9.32193]
},
"0.8333": {
"vector": [-5.88555, -2.3769, -11.32892]
},
"1.0": {
"vector": [-9.34408, -4.75534, -18.42059]
},
"1.1333": {
"vector": [-9.38874, -7.60985, -23.07869]
},
"1.2667": {
"vector": [-10.24715, -5.95025, -18.81876]
},
"1.3667": {
"vector": [-8.12419, -7.45506, -29.35893]
},
"1.4667": {
"vector": [-7.83961, -7.64874, -23.48517]
},
"1.6": {
"vector": [-6.15195, -7.38276, -30.85418]
},
"1.8333": {
"vector": [-1.32665, -0.87449, -1.81369]
},
"1.9667": {
"vector": [0, 0, 0]
}
},
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"0.0667": {
"vector": [-0.575, -1, 0]
},
"0.1333": {
"vector": [-1.075, -0.58, 0.14]
},
"0.2333": {
"vector": [-0.38, 1.05, 0.35]
}, },
"0.4": { "0.4": {
"vector": [-0.705, -2.775, -0.675] "vector": [2.75, 0, 2]
}, },
"0.5333": { "0.6": {
"vector": [-0.975, -1.895, -1.475] "vector": [-2, 0, -8]
},
"0.6667": {
"vector": [-0.705, -1.375, -1.575]
},
"0.7667": {
"vector": [-0.365, -1.53, -2.165]
},
"0.9": {
"vector": [-0.55, -1.27, -3.6]
}, },
"1.0": { "1.0": {
"vector": [-0.655, -0.63, -2.29] "vector": [-5.04, -5, -31.25],
"easing": "easeInOutCubic"
}, },
"1.0667": { "1.2": {
"vector": [-0.7, -0.55, -1.85] "vector": [-5.96, -5, -31.92]
},
"1.1667": {
"vector": [-0.85, -0.45, -1.3]
},
"1.2333": {
"vector": [-1.025, -0.475, -1.3]
},
"1.3333": {
"vector": [-1.2, 0.5, -1.3]
}, },
"1.4": { "1.4": {
"vector": [-1.225, 0.35, -0.775] "vector": [-7.79, -5, -27.25]
}, },
"1.5": { "1.5": {
"vector": [-1.075, -0.225, -1.025] "vector": [-12.29, -4.5, -25.25]
}, },
"1.6667": { "1.6": {
"vector": [-0.85, -1.33, 1.315] "vector": [-6.27, -1.56, -20]
}, },
"1.8": { "1.9": {
"vector": [-1.05, -1.23, -1.57] "vector": [-1.25, -1.04, -1.92]
}, },
"1.9333": { "2.0": {
"vector": [0, 0, 0]
}
}
},
"leftarm": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.1333": {
"vector": [-2.52451, 2.51586, 4.87331]
},
"0.2": {
"vector": [-4.65535, 4.60961, 5.29626]
},
"0.3667": {
"vector": [-0.8331, 9.56604, 5.33355]
},
"0.5": {
"vector": [-0.8331, 9.56604, 5.33355]
},
"0.8333": {
"vector": [-0.8331, 9.56604, 5.33355]
},
"1.0333": {
"vector": [-0.90449, 6.26421, 1.57763]
},
"1.1": {
"vector": [-4.13382, 8.16291, 3.90739]
},
"1.1667": {
"vector": [-4.14952, 6.93448, 2.6609]
},
"1.2333": {
"vector": [-5.88777, 8.01958, 3.69662]
},
"1.3": {
"vector": [-12.90281, 5.18223, 7.50648]
},
"1.3667": {
"vector": [-24.05947, 7.3808, 13.72891]
},
"1.6333": {
"vector": [-24.34483, 14.54802, 14.95208]
},
"1.9333": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
} }
}, },
@ -821,52 +504,41 @@
"0.0": { "0.0": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
}, },
"0.0667": {
"vector": [5.66, -4.79, 8.6]
},
"0.1333": {
"vector": [5.125, -8.7, 16.225]
},
"0.2": { "0.2": {
"vector": [5.85, -9.575, 17.2] "vector": [-1, 1.4, 0],
"easing": "easeInOutCubic"
}, },
"0.3667": { "0.3": {
"vector": [6.38, -22.955, 17.2] "vector": [-1, -4.4, 0]
}, },
"0.5": { "0.5": {
"vector": [11.205, -43.26, 14.05] "vector": [-1, 1.00781, -0.45937]
}, },
"0.8333": { "0.7": {
"vector": [11.205, -43.26, 14.05] "vector": [-1, -0.175, 0.4]
}, },
"1.0333": { "0.9": {
"vector": [9.585, -22.51, 16.6] "vector": [-1, -0.19, 0.4]
}, },
"1.1": { "1.0": {
"vector": [7.355, -24.01, 15.05] "vector": [-1, -0.2, 0.4]
}, },
"1.1667": { "1.2": {
"vector": [6.66, -22.535, 15.05] "vector": [-0.4, -0.01266, 0.4]
}, },
"1.2333": { "1.4": {
"vector": [6.835, -20.59, 15.05] "vector": [-1.02, 1.16, -0.15]
},
"1.3": {
"vector": [6.165, -20.165, 12.625]
},
"1.3667": {
"vector": [4.995, -11.86, 8.93]
}, },
"1.5": { "1.5": {
"vector": [4.99, -11.1, 9.02] "vector": [-1.9, 3.18734, 0.4]
}, },
"1.6333": { "1.7": {
"vector": [4.995, -8.935, 7.105] "vector": [0.58, 0.21, 0.65]
}, },
"1.7667": { "1.8": {
"vector": [5.93, -4.96, 3.95] "vector": [0.76, 1.15, 2.27]
}, },
"1.9333": { "2.0": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
} }
} }
@ -879,6 +551,39 @@
"vector": [0, 0, 0] "vector": [0, 0, 0]
} }
}, },
"lefthand": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.1": {
"vector": [-6, 10, -7]
},
"1.5": {
"vector": [-6, 10, -7]
},
"1.7": {
"vector": [0, -13, 0]
},
"1.8": {
"vector": [0, 0, 0]
}
},
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"0.1": {
"vector": [14.4, -2.6, 18.1]
},
"1.5": {
"vector": [14.4, -2.6, 18.1]
},
"1.8": {
"vector": [0, 0, 0]
}
}
},
"magazine": { "magazine": {
"rotation": { "rotation": {
"0.0": { "0.0": {
@ -887,29 +592,18 @@
"0.2": { "0.2": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
}, },
"0.3667": {
"vector": [0, 0, 0]
},
"0.5": { "0.5": {
"vector": [-7.13393, -4.72045, -10.26812] "vector": [-7.5, -7.5, 0]
}, },
"0.8333": { "1.0": {
"vector": [-7.13393, -4.72045, -10.26812] "vector": [-10.18265, -10.62035, -13.41879]
},
"1.0333": {
"vector": [-2.18265, -10.62035, -13.41879]
}, },
"1.1": { "1.1": {
"vector": [-1.22936, -2.76749, -1.26655] "vector": [-1.22936, -2.76749, -1.26655]
}, },
"1.1667": { "1.4": {
"vector": [0.4684, -6.5091, -1.62015] "vector": [0, 0, 0],
}, "easing": "easeInQuart"
"1.2333": {
"vector": [0, 0, 0]
},
"1.3667": {
"vector": [0, 0, 0]
} }
}, },
"position": { "position": {
@ -919,67 +613,20 @@
"0.2": { "0.2": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
}, },
"0.3667": {
"vector": [0, -14.975, -0.525]
},
"0.5": { "0.5": {
"vector": [6.8, -31.28, -2.97] "vector": [1.7, -30, -2]
}, },
"0.8333": { "1.0": {
"vector": [6.8, -31.28, -2.97] "vector": [3.55, -15.8, -2.2]
},
"1.0333": {
"vector": [6.15, -15.8, -2.2]
}, },
"1.1": { "1.1": {
"vector": [0.765, -15.37, -1.305] "vector": [0.765, -15.37, -1.305]
}, },
"1.1667": { "1.4": {
"vector": [0.62, -14.645, -1.335] "vector": [0, 0, 0],
}, "easing": "easeInQuart"
"1.2333": {
"vector": [0, -12.25, -0.525]
},
"1.3": {
"vector": [0, -10.005, -0.52]
},
"1.3667": {
"vector": [0, 0, 0]
} }
} }
},
"shell": {
"position": {
"0.0": {
"vector": [0, -1, 0]
},
"0.6": {
"vector": [0, -1, 0]
},
"0.6333": {
"vector": [0, 0, 0]
}
}
}
},
"sound_effects": {
"0.0": {
"effect": "ak_magout"
},
"0.1333": {
"effect": "m4_magout"
},
"0.5": {
"effect": "foley_start"
},
"1.0333": {
"effect": "ak_magin"
},
"1.1": {
"effect": "m4_magin"
},
"1.5": {
"effect": "foley_end"
} }
} }
} }

File diff suppressed because it is too large Load diff

View file

@ -240,12 +240,12 @@
"origin": [-6.2, -5.8, 17.4], "origin": [-6.2, -5.8, 17.4],
"size": [4, 12, 4], "size": [4, 12, 4],
"uv": { "uv": {
"north": {"uv": [0, 124.25], "uv_size": [4, 3.75]}, "north": {"uv": [0, 72.75], "uv_size": [4, 2]},
"east": {"uv": [18.75, 12.25], "uv_size": [4, 2]}, "east": {"uv": [0, 72.75], "uv_size": [4, 2]},
"south": {"uv": [18.75, 12.25], "uv_size": [4, 2]}, "south": {"uv": [0, 72.75], "uv_size": [4, 2]},
"west": {"uv": [18.75, 12.25], "uv_size": [4, 2]}, "west": {"uv": [0, 72.75], "uv_size": [4, 2]},
"up": {"uv": [22.75, 14.25], "uv_size": [-4, -2]}, "up": {"uv": [4, 74.75], "uv_size": [-4, -2]},
"down": {"uv": [22.75, 14.25], "uv_size": [-4, -2]} "down": {"uv": [4, 74.75], "uv_size": [-4, -2]}
} }
} }
] ]

View file

@ -10973,8 +10973,6 @@
{ {
"origin": [-0.11171, 2.19333, -22.59329], "origin": [-0.11171, 2.19333, -22.59329],
"size": [0.21733, 0.12256, 1.49725], "size": [0.21733, 0.12256, 1.49725],
"pivot": [-0.00305, 1.76437, -18.31002],
"rotation": [0, 0, 0],
"uv": { "uv": {
"north": {"uv": [79, 27], "uv_size": [0.25, 0.25]}, "north": {"uv": [79, 27], "uv_size": [0.25, 0.25]},
"east": {"uv": [63, 19], "uv_size": [1.5, 0.25]}, "east": {"uv": [63, 19], "uv_size": [1.5, 0.25]},

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB