From 41dd80747cd662aad3db5a0ee5a9eabe3fc1f669 Mon Sep 17 00:00:00 2001
From: Atsuihsio <842960157@qq.com>
Date: Wed, 30 Oct 2024 01:06:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E6=98=AF=E4=BC=98=E5=8C=96=E5=8A=A8?=
 =?UTF-8?q?=E7=94=BB=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/model/item/M4ItemModel.java             |  2 +-
 .../superbwarfare/event/ClientEventHandler.java    | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java
index b417f3831..805cbb9d6 100644
--- a/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java
+++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java
@@ -132,7 +132,7 @@ public class M4ItemModel extends GeoModel<M4Item> {
         crossAlt.setPosY(-0.2f * (float) fpz);
         cross3.setPosY(-0.2f * (float) fpz);
 
-        shen.setPosX((float) (shen.getPosX() * (1 - 0.5 * zt)));
+        shen.setPosX((float) (shen.getPosX() * (1 - 0.8 * zt)));
         shen.setPosY((float) (shen.getPosY() * (-1 + 0.8 * zt)));
         shen.setPosZ((float) (shen.getPosZ() * (1 - 0.6 * zt)));
         shen.setRotX((float) (shen.getRotX() * (1 - (type == 3 ? 0.96 : type == 1 ? 0.4 : 0.9) * zt)));
diff --git a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java
index 272e30821..5093b1970 100644
--- a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java
+++ b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java
@@ -186,11 +186,13 @@ public class ClientEventHandler {
 
         double spread = stack.is(ModTags.Items.SHOTGUN) || stack.is(ModItems.MINIGUN.get()) ? 1.2 * zoomSpread * (basicDev + 0.2 * (walk + sprint + crouching + prone + jump + ride) + fireSpread) : zoomSpread * (0.7 * basicDev + walk + sprint + crouching + prone + jump + ride + 0.8 * fireSpread);
 
-        if (gunSpread < spread) {
-            gunSpread += 0.07 * Math.pow(spread - gunSpread, 2) * times;
-        } else {
-            gunSpread -= 0.07 * Math.pow(spread - gunSpread, 2) * times;
-        }
+//        if (gunSpread < spread) {
+//            gunSpread += 0.07 * Math.pow(spread - gunSpread, 2) * times;
+//        } else {
+//            gunSpread -= 0.07 * Math.pow(spread - gunSpread, 2) * times;
+//        }
+
+        gunSpread = Mth.lerp(0.07 * times, gunSpread, spread);
 
         // 开火部分
         double weight = stack.getOrCreateTag().getDouble("weight") + stack.getOrCreateTag().getDouble("CustomWeight");
@@ -786,7 +788,7 @@ public class ClientEventHandler {
                 p = zoomPos;
             }
 
-            customZoom = Mth.lerp(0.5 * times, customZoom, stack.getOrCreateTag().getDouble("CustomZoom"));
+            customZoom = Mth.lerp(0.6 * times, customZoom, stack.getOrCreateTag().getDouble("CustomZoom"));
 
             double zoom = 1.25 + customZoom;