完善牛头王

This commit is contained in:
Atsuihsio 2024-07-16 00:40:29 +08:00
parent 07187e3e6a
commit 1b0c85a22b
6 changed files with 227 additions and 23 deletions

View file

@ -76,9 +76,9 @@ public class Ntw20Model extends GeoModel<Ntw20> {
double p = player.getPersistentData().getDouble("zoom_pos"); double p = player.getPersistentData().getDouble("zoom_pos");
double zp = player.getPersistentData().getDouble("zoom_pos_z"); double zp = player.getPersistentData().getDouble("zoom_pos_z");
gun.setPosX(4.53f * (float) p); gun.setPosX(4.54f * (float) p);
gun.setPosY(-0.44f * (float) p - (float) (0.2f * zp)); gun.setPosY(-0.45f * (float) p - (float) (0.2f * zp));
gun.setPosZ(10.0f * (float) p + (float) (0.3f * zp)); gun.setPosZ(10.0f * (float) p + (float) (0.3f * zp));
@ -88,7 +88,7 @@ public class Ntw20Model extends GeoModel<Ntw20> {
scope.setScaleZ(1f - (0.85f * (float) p)); scope.setScaleZ(1f - (0.85f * (float) p));
if (gun.getPosX() > 2.5f) { if (gun.getPosX() > 4.3f) {
rex.setHidden(false); rex.setHidden(false);
action.setHidden(true); action.setHidden(true);
body.setHidden(true); body.setHidden(true);

View file

@ -389,17 +389,17 @@
"easing": "easeInElastic" "easing": "easeInElastic"
}, },
"0.8": { "0.8": {
"vector": [-0.31416, 0.04967, 1.38769], "vector": [-0.31416, 0.04967, 0.58769],
"easing": "easeInOutSine" "easing": "easeInOutSine"
}, },
"0.95": { "0.95": {
"vector": [0.19441, -0.28765, -0.41296], "vector": [0.19441, -0.11765, -0.41296],
"easing": "easeInOutSine" "easing": "easeInOutSine"
}, },
"1.05": { "1.0": {
"vector": [0.07786, 0.19942, -0.0585] "vector": [0.07786, 0.19942, -0.0585]
}, },
"1.35": { "1.2": {
"vector": [0, 0, 0], "vector": [0, 0, 0],
"easing": "easeOutBack" "easing": "easeOutBack"
} }
@ -409,19 +409,19 @@
"vector": [0, 0, 0] "vector": [0, 0, 0]
}, },
"0.35": { "0.35": {
"vector": [0.07, 0.045, 0], "vector": [-0.07, 0.045, 0],
"easing": "easeInElastic" "easing": "easeInElastic"
}, },
"0.45": { "0.45": {
"vector": [0.085, 0, 0], "vector": [-0.085, 0, 0],
"easing": "easeOutSine" "easing": "easeOutSine"
}, },
"0.65": { "0.65": {
"vector": [0.28, 0.2, 1.3], "vector": [-0.08, 0.2, 1.3],
"easing": "easeInElastic" "easing": "easeInElastic"
}, },
"0.7": { "0.7": {
"vector": [0.28, 0.2, 1.3], "vector": [-0.08, 0.2, 1.3],
"easing": "easeInElastic" "easing": "easeInElastic"
}, },
"0.85": { "0.85": {
@ -432,10 +432,10 @@
"vector": [0.19, -0.2, -1], "vector": [0.19, -0.2, -1],
"easing": "easeInOutSine" "easing": "easeInOutSine"
}, },
"1.15": { "1.1": {
"vector": [-0.002, 0.009, 0.05] "vector": [-0.002, 0.009, 0.05]
}, },
"1.35": { "1.2": {
"vector": [0, 0, 0], "vector": [0, 0, 0],
"easing": "easeOutBack" "easing": "easeOutBack"
} }

View file

@ -8537,13 +8537,217 @@
{ {
"name": "rex", "name": "rex",
"parent": "0", "parent": "0",
"pivot": [0, 7.72344, -82.76641], "pivot": [0, 7.72344, -59.76641],
"cubes": [ "cubes": [
{ {
"origin": [-9.8154, -2.09196, -50.76641], "origin": [-0.02478, -2.09196, -59.76641],
"size": [19.6308, 19.6308, 0], "size": [0.04955, 19.6308, 0],
"pivot": [0, 7.72344, -59.76641],
"rotation": [0, 0, -90],
"uv": { "uv": {
"south": {"uv": [95.2625, 54.25], "uv_size": [32, 32]} "south": {"uv": [127, 0], "uv_size": [1, 1]}
}
},
{
"origin": [-0.02478, -2.09196, -59.76641],
"size": [0.04955, 19.6308, 0],
"uv": {
"south": {"uv": [127, 0], "uv_size": [1, 1]}
}
},
{
"origin": [-0.04157, -2.09196, -59.76641],
"size": [0.08314, 4, 0],
"pivot": [0, 7.72344, -59.76641],
"rotation": [0, 0, -90],
"uv": {
"south": {"uv": [127, 0], "uv_size": [1, 1]}
}
},
{
"origin": [-0.04157, -2.09196, -59.76641],
"size": [0.08314, 4, 0],
"pivot": [0, 7.72344, -59.76641],
"rotation": [0, 0, 90],
"uv": {
"south": {"uv": [128, 0], "uv_size": [-1, 1]}
}
},
{
"origin": [-0.04157, -2.09196, -59.76641],
"size": [0.08314, 4, 0],
"pivot": [0, 7.72344, -59.76641],
"rotation": [0, 0, 0],
"uv": {
"south": {"uv": [128, 0], "uv_size": [-1, 1]}
}
},
{
"origin": [-0.04157, -2.09196, -59.76641],
"size": [0.08314, 4, 0],
"pivot": [0, 7.72344, -59.76641],
"rotation": [0, 0, -180],
"uv": {
"south": {"uv": [127, 0], "uv_size": [1, 1]}
}
}
]
},
{
"name": "bone12",
"parent": "rex",
"pivot": [0, 7.72344, -59.76641],
"cubes": [
{
"origin": [-0.04157, 6.58147, -59.76641],
"size": [0.08314, 0.07656, 0],
"pivot": [0, 7.72344, -59.76641],
"rotation": [0, 0, -90],
"uv": {
"south": {"uv": [127, 0], "uv_size": [1, 1]}
}
},
{
"origin": [-0.04157, 5.58147, -59.76641],
"size": [0.08314, 0.07656, 0],
"pivot": [0, 7.72344, -59.76641],
"rotation": [0, 0, -90],
"uv": {
"south": {"uv": [127, 0], "uv_size": [1, 1]}
}
},
{
"origin": [-0.04157, 4.58147, -59.76641],
"size": [0.08314, 0.07656, 0],
"pivot": [0, 7.72344, -59.76641],
"rotation": [0, 0, -90],
"uv": {
"south": {"uv": [127, 0], "uv_size": [1, 1]}
}
},
{
"origin": [-0.04157, 3.58147, -59.76641],
"size": [0.08314, 0.07656, 0],
"pivot": [0, 7.72344, -59.76641],
"rotation": [0, 0, -90],
"uv": {
"south": {"uv": [127, 0], "uv_size": [1, 1]}
}
},
{
"origin": [-0.04157, 3.58147, -59.76641],
"size": [0.08314, 0.07656, 0],
"pivot": [0, 7.72344, -59.76641],
"rotation": [0, 0, 90],
"uv": {
"south": {"uv": [128, 0], "uv_size": [-1, 1]}
}
},
{
"origin": [-0.04157, 6.58147, -59.76641],
"size": [0.08314, 0.07656, 0],
"pivot": [0, 7.72344, -59.76641],
"rotation": [0, 0, 90],
"uv": {
"south": {"uv": [128, 0], "uv_size": [-1, 1]}
}
},
{
"origin": [-0.04157, 5.58147, -59.76641],
"size": [0.08314, 0.07656, 0],
"pivot": [0, 7.72344, -59.76641],
"rotation": [0, 0, 90],
"uv": {
"south": {"uv": [128, 0], "uv_size": [-1, 1]}
}
},
{
"origin": [-0.04157, 4.58147, -59.76641],
"size": [0.08314, 0.07656, 0],
"pivot": [0, 7.72344, -59.76641],
"rotation": [0, 0, 90],
"uv": {
"south": {"uv": [128, 0], "uv_size": [-1, 1]}
}
}
]
},
{
"name": "bone13",
"parent": "rex",
"pivot": [0, 7.72344, -59.76641],
"rotation": [0, 0, -90],
"cubes": [
{
"origin": [-0.04157, 6.58147, -59.76641],
"size": [0.08314, 0.07656, 0],
"pivot": [0, 7.72344, -59.76641],
"rotation": [0, 0, -90],
"uv": {
"south": {"uv": [127, 0], "uv_size": [1, 1]}
}
},
{
"origin": [-0.04157, 5.58147, -59.76641],
"size": [0.08314, 0.07656, 0],
"pivot": [0, 7.72344, -59.76641],
"rotation": [0, 0, -90],
"uv": {
"south": {"uv": [127, 0], "uv_size": [1, 1]}
}
},
{
"origin": [-0.04157, 4.58147, -59.76641],
"size": [0.08314, 0.07656, 0],
"pivot": [0, 7.72344, -59.76641],
"rotation": [0, 0, -90],
"uv": {
"south": {"uv": [127, 0], "uv_size": [1, 1]}
}
},
{
"origin": [-0.04157, 3.58147, -59.76641],
"size": [0.08314, 0.07656, 0],
"pivot": [0, 7.72344, -59.76641],
"rotation": [0, 0, -90],
"uv": {
"south": {"uv": [127, 0], "uv_size": [1, 1]}
}
},
{
"origin": [-0.04157, 3.58147, -59.76641],
"size": [0.08314, 0.07656, 0],
"pivot": [0, 7.72344, -59.76641],
"rotation": [0, 0, 90],
"uv": {
"south": {"uv": [128, 0], "uv_size": [-1, 1]}
}
},
{
"origin": [-0.04157, 6.58147, -59.76641],
"size": [0.08314, 0.07656, 0],
"pivot": [0, 7.72344, -59.76641],
"rotation": [0, 0, 90],
"uv": {
"south": {"uv": [128, 0], "uv_size": [-1, 1]}
}
},
{
"origin": [-0.04157, 5.58147, -59.76641],
"size": [0.08314, 0.07656, 0],
"pivot": [0, 7.72344, -59.76641],
"rotation": [0, 0, 90],
"uv": {
"south": {"uv": [128, 0], "uv_size": [-1, 1]}
}
},
{
"origin": [-0.04157, 4.58147, -59.76641],
"size": [0.08314, 0.07656, 0],
"pivot": [0, 7.72344, -59.76641],
"rotation": [0, 0, 90],
"uv": {
"south": {"uv": [128, 0], "uv_size": [-1, 1]}
} }
} }
] ]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 131 KiB

After

Width:  |  Height:  |  Size: 129 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

View file

@ -1,14 +1,14 @@
{ {
"zoom_speed": 0.6, "zoom_speed": 0.6,
"zoom": 8, "zoom": 6,
"min_zoom": 4, "min_zoom": 1.3,
"max_zoom": 8, "max_zoom": 6,
"bipod": 1, "bipod": 1,
"dev": 6, "dev": 6,
"recoil_x": 0.002, "recoil_x": 0.01,
"recoil_y": 0.088, "recoil_y": 0.038,
"damage": 140, "damage": 140,
"headshot": 3, "headshot": 4,
"velocity": 31, "velocity": 31,
"projectile_amount": 1, "projectile_amount": 1,
"mag": 3, "mag": 3,