From 9f33610f2005247567041929eb8ef76fe2f3cb2b Mon Sep 17 00:00:00 2001
From: kron <kai_hong@126.com>
Date: Wed, 12 Nov 2025 20:40:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=86=E6=9C=AC=E7=BB=86=E8=8A=82?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/audioManager.js              |   2 +-
 src/components/AppFooter.vue     |  12 ++--
 src/components/BowTarget.vue     |  11 ++--
 src/components/BowTargetEdit.vue |   6 +-
 src/components/PointRecord.vue   | 103 ++++++++++---------------------
 src/pages/point-book-detail.vue  |  72 +++++++++++----------
 src/pages/point-book-edit.vue    |   2 +-
 src/pages/point-book-list.vue    |  39 ++++++++++--
 src/pages/point-book.vue         |   4 +-
 src/static/add-note.png          | Bin 0 -> 699 bytes
 src/static/edit.png              | Bin 363 -> 0 bytes
 src/static/has-note.png          | Bin 0 -> 678 bytes
 src/static/tab-mall.png          | Bin 2912 -> 3155 bytes
 13 files changed, 128 insertions(+), 123 deletions(-)
 create mode 100644 src/static/add-note.png
 delete mode 100644 src/static/edit.png
 create mode 100644 src/static/has-note.png

diff --git a/src/audioManager.js b/src/audioManager.js
index c0d5beb..08832df 100644
--- a/src/audioManager.js
+++ b/src/audioManager.js
@@ -38,7 +38,7 @@ export const audioFils = {
   射击无效:
     "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutya55ufiiw8oo55.mp3",
   未上靶:
-    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcuuznjc78ljhzuw1o.mp3",
+    "https://static.shelingxingqiu.com/attachment/2025-11-12/de6n45o3tsm1v4unam.mp3",
   "1环":
     "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutxin1aq7gxjih5l.mp3",
   "2环":
diff --git a/src/components/AppFooter.vue b/src/components/AppFooter.vue
index c6c8cf2..b030755 100644
--- a/src/components/AppFooter.vue
+++ b/src/components/AppFooter.vue
@@ -1,5 +1,4 @@
 <script setup>
-
 const tabs = [
   { image: "../static/tab-vip.png" },
   { image: "../static/tab-point-book.png" },
@@ -34,7 +33,7 @@ function handleTabClick(index) {
       class="tab-item"
       @click="handleTabClick(index)"
       :style="{
-        width: index === 1 ? '36%' : '10%',
+        width: index === 1 ? '36%' : '20%',
       }"
     >
       <image :src="tab.image" mode="widthFix" />
@@ -64,10 +63,13 @@ function handleTabClick(index) {
   justify-content: center;
 }
 .tab-item > image {
-  width: 86%;
+  width: 65rpx;
+}
+.tab-item:last-child > image {
+  width: 85rpx;
 }
 .tab-item:nth-child(2) {
-  transform: translate(25%, 30%);
+  transform: translate(10%, 40%);
 }
 .tab-item:nth-child(3) {
   margin-bottom: 25rpx;
@@ -76,6 +78,6 @@ function handleTabClick(index) {
   width: 140rpx;
 }
 .tab-item:nth-child(4) {
-  transform: translate(-25%, 30%);
+  transform: translate(-10%, 44%);
 }
 </style>
diff --git a/src/components/BowTarget.vue b/src/components/BowTarget.vue
index 330f8ca..eac590a 100644
--- a/src/components/BowTarget.vue
+++ b/src/components/BowTarget.vue
@@ -109,7 +109,7 @@ const arrowStyle = computed(() => {
   return {
     transform: `rotateX(180deg) translate(-50%, -50%) rotate(${
       360 - angle.value
-    }deg) translateY(100%)`,
+    }deg) translateY(105%)`,
   };
 });
 
@@ -119,9 +119,12 @@ async function onReceiveMessage(messages = []) {
       msg.constructor === MESSAGETYPES.ShootSyncMeArrowID ||
       msg.constructor === MESSAGETYPES.ShootResult
     ) {
-      if (msg.userId === user.value.id) {
-        angle.value =
-          !msg.target.ring && msg.target.angle >= 0 ? msg.target.angle : null;
+      if (
+        msg.userId === user.value.id &&
+        !msg.target.ring &&
+        msg.target.angle >= 0
+      ) {
+        angle.value = msg.target.angle;
         dirTimer.value = setTimeout(() => {
           angle.value = null;
         }, 1200);
diff --git a/src/components/BowTargetEdit.vue b/src/components/BowTargetEdit.vue
index a1b2fe3..59b7f08 100644
--- a/src/components/BowTargetEdit.vue
+++ b/src/components/BowTargetEdit.vue
@@ -19,6 +19,10 @@ const props = defineProps({
     type: Function,
     default: null,
   },
+  scroll: {
+    type: Boolean,
+    default: true,
+  },
 });
 
 const rect = ref({});
@@ -166,7 +170,7 @@ onMounted(async () => {
 
 <template>
   <scroll-view
-    scroll-y
+    :scroll-y="scroll"
     scroll-with-animation
     :scroll-top="scrollTop"
     class="container"
diff --git a/src/components/PointRecord.vue b/src/components/PointRecord.vue
index bf63d91..0a802ed 100644
--- a/src/components/PointRecord.vue
+++ b/src/components/PointRecord.vue
@@ -6,17 +6,9 @@ const props = defineProps({
     type: Object,
     default: () => {},
   },
-  onRemove: {
-    type: Function,
-    default: null,
-  },
 });
 const bowOptions = ref({});
 const targetOptions = ref({});
-// 使用插槽自定义右侧按钮为图标，若需要文字按钮可恢复 rightOptions
-
-// 根据是否传入 onRemove 来决定是否允许左滑
-const canSwipe = computed(() => typeof props.onRemove === "function");
 
 const toDetailPage = () => {
   const config = uni.getStorageSync("point-book-config");
@@ -46,60 +38,41 @@ onMounted(() => {
     targetOptions.value[item.id] = item;
   });
 });
-
-const onSwipeActionClick = () => {
-  if (typeof props.onRemove === "function") props.onRemove(props.data);
-};
 </script>
 
 <template>
-  <uni-swipe-action>
-    <uni-swipe-action-item :disabled="!canSwipe" @change="() => {}">
-      <template v-slot:right v-if="canSwipe">
-        <view class="swipe-right" @click="onSwipeActionClick">
-          <image
-            class="swipe-icon"
-            src="../static/delete-white.png"
-            mode="widthFix"
-          />
-        </view>
-      </template>
-      <view class="container" @click="toDetailPage">
-        <view class="left-part">
-          <view class="labels">
-            <view></view>
-            <text>{{
-              bowOptions[data.bowType] ? bowOptions[data.bowType].name : ""
-            }}</text>
-            <text>{{ data.distance }} 米</text>
-            <text>{{
-              targetOptions[data.targetType]
-                ? targetOptions[data.targetType].name
-                : ""
-            }}</text>
-          </view>
-          <view>
-            <text>{{ data.createAt }}</text>
-          </view>
-          <view>
-            <text
-              >黄心率：{{ Number((data.yellowRate * 100).toFixed(2)) }}%</text
-            >
-            <text>10环数：{{ data.tenRings }}</text>
-            <text>平均：{{ data.averageRing }}</text>
-          </view>
-        </view>
-        <view class="right-part">
-          <image src="../static/bow-target.png" mode="widthFix" />
-          <view class="arrow-amount">
-            <text>{{ data.actualTotalRing }}</text>
-            <text>/</text>
-            <text>{{ data.totalRing }}</text>
-          </view>
-        </view>
+  <view class="container" @click="toDetailPage">
+    <view class="left-part">
+      <view class="labels">
+        <view></view>
+        <text>{{
+          bowOptions[data.bowType] ? bowOptions[data.bowType].name : ""
+        }}</text>
+        <text>{{ data.distance }} 米</text>
+        <text>{{
+          targetOptions[data.targetType]
+            ? targetOptions[data.targetType].name
+            : ""
+        }}</text>
       </view>
-    </uni-swipe-action-item>
-  </uni-swipe-action>
+      <view>
+        <text>{{ data.createAt }}</text>
+      </view>
+      <view>
+        <text>黄心率：{{ Number((data.yellowRate * 100).toFixed(2)) }}%</text>
+        <text>10环数：{{ data.tenRings }}</text>
+        <text>平均：{{ data.averageRing }}</text>
+      </view>
+    </view>
+    <view class="right-part">
+      <image src="../static/bow-target.png" mode="widthFix" />
+      <view class="arrow-amount">
+        <text>{{ data.actualTotalRing }}</text>
+        <text>/</text>
+        <text>{{ data.totalRing }}</text>
+      </view>
+    </view>
+  </view>
 </template>
 
 <style scoped>
@@ -176,18 +149,4 @@ const onSwipeActionClick = () => {
   font-size: 30rpx;
   color: #fff;
 }
-
-/* 右侧滑动按钮（自定义宽度与图标） */
-.swipe-right {
-  width: 120rpx; /* 这里可按需调整按钮宽度 */
-  height: 100%;
-  background-color: #ff7c7c;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-.swipe-icon {
-  width: 44rpx;
-  height: 44rpx;
-}
 </style>
diff --git a/src/pages/point-book-detail.vue b/src/pages/point-book-detail.vue
index 72e16ec..a0f1b1e 100644
--- a/src/pages/point-book-detail.vue
+++ b/src/pages/point-book-detail.vue
@@ -42,9 +42,11 @@ const closeTip = () => {
 };
 
 const saveNote = async () => {
-  showTip3.value = false;
-  if (record.value.id) {
-    await addNoteAPI(record.value.id, notes.value);
+  if (record.value.id && notes.value) {
+    if (record.value.remark !== notes.value) {
+      await addNoteAPI(record.value.id, notes.value);
+    }
+    showTip3.value = false;
   }
 };
 
@@ -207,8 +209,11 @@ onShareTimeline(async () => {
           @click="() => openTip(3)"
           v-if="user.id === record.user.id"
         >
-          <image src="../static/edit.png" mode="widthFix" />
-          <text>备注</text>
+          <image
+            :src="`../static/${notes ? 'has' : 'add'}-note.png`"
+            mode="widthFix"
+          />
+          <text>{{ notes ? "我的备注" : "添加备注" }}</text>
         </button>
       </view>
       <view class="title-bar">
@@ -222,14 +227,15 @@ onShareTimeline(async () => {
           />
         </button> -->
       </view>
-      <view :style="{ transform: 'translateY(-45rpx) scale(0.9)' }">
+      <view :style="{ transform: 'translateY(-64rpx) scale(0.9)' }">
         <BowTargetEdit
           :id="targetId"
           :src="targetSrc"
           :arrows="arrows.filter((item) => item.x && item.y)"
+          :scroll="false"
         />
       </view>
-      <view :style="{ transform: 'translateY(-60rpx)' }">
+      <view :style="{ transform: 'translateY(-100rpx)' }">
         <!-- <view class="title-bar">
           <view />
           <text>环值分布</text>
@@ -289,10 +295,7 @@ onShareTimeline(async () => {
           </button> -->
         </view>
       </view>
-      <ScreenHint2
-        :show="showTip || showTip2 || showTip3"
-        :onClose="showTip3 ? null : closeTip"
-      >
+      <ScreenHint2 :show="showTip || showTip2 || showTip3" :onClose="closeTip">
         <view class="tip-content">
           <block v-if="showTip">
             <text>落点稳定性说明</text>
@@ -309,14 +312,19 @@ onShareTimeline(async () => {
             <textarea
               v-model="notes"
               maxlength="300"
-              rows="4"
+              rows="3"
               class="notes-input"
               placeholder="写下本次射箭的补充信息与心得"
               placeholder-style="color: #ccc;"
             />
             <view>
-              <button hover-class="none" @click="showTip3 = false">取消</button>
-              <button hover-class="none" @click="saveNote">保存备注</button>
+              <button
+                hover-class="none"
+                @click="saveNote"
+                :class="notes ? '' : 'button-disabled'"
+              >
+                保存备注
+              </button>
             </view>
           </block>
         </view>
@@ -394,15 +402,15 @@ onShareTimeline(async () => {
 }
 .detail-data > button {
   display: flex;
+  flex-direction: column;
+  justify-content: space-around;
   align-items: center;
-  font-size: 26rpx;
-  color: #999999;
+  font-size: 24rpx;
+  color: #333333;
 }
 .detail-data > button > image {
-  width: 28rpx;
-  height: 28rpx;
-  margin-right: 10rpx;
-  margin-left: 20rpx;
+  width: 44rpx;
+  height: 44rpx;
 }
 .question-mark {
   width: 28rpx;
@@ -452,7 +460,7 @@ onShareTimeline(async () => {
   width: 100%;
   display: flex;
   align-items: center;
-  justify-content: space-between;
+  justify-content: center;
 }
 .tip-content > view > input {
   width: 80%;
@@ -465,21 +473,21 @@ onShareTimeline(async () => {
 }
 .tip-content > view > button {
   width: 48%;
-  background: linear-gradient(180deg, #fbfbfb 0%, #f5f5f5 100%);
-  border-radius: 22px;
-  border: 1px solid #eeeeee;
+  border-radius: 44rpx;
   padding: 12px 0;
   font-size: 14px;
   color: #000;
-}
-.tip-content > view > button:last-child {
   background: #fed847;
 }
+.button-disabled {
+  background: linear-gradient(180deg, #fbfbfb 0%, #f5f5f5 100%) !important;
+  color: #ccc !important;
+}
 .ring-text-groups {
   display: flex;
   flex-direction: column;
   padding: 20rpx;
-  padding-top: 40rpx;
+  padding-top: 50rpx;
   font-size: 24rpx;
   color: #999999;
 }
@@ -489,10 +497,9 @@ onShareTimeline(async () => {
 }
 .ring-text-groups > view > view:first-child:nth-last-child(2) {
   margin-top: 10rpx;
-  margin-left: 30rpx;
-  width: 90rpx;
+  width: 115rpx;
   text-align: center;
-  justify-content: flex-end;
+  justify-content: flex-start;
   font-size: 20rpx;
   display: flex;
   color: #999;
@@ -504,18 +511,17 @@ onShareTimeline(async () => {
   > view
   > view:first-child:nth-last-child(2)
   > text:nth-child(2) {
-  font-size: 40rpx;
-  /* min-width: 45rpx; */
+  font-size: 28rpx;
   color: #666;
   margin-right: 6rpx;
   margin-top: -5rpx;
+  font-weight: 500;
 }
 .ring-text-groups > view > view:last-child {
   width: 80%;
   display: flex;
   flex-wrap: wrap;
   margin-bottom: 30rpx;
-  transform: translateX(20rpx);
 }
 .ring-text-groups > view > view:last-child > text {
   width: 16.6%;
diff --git a/src/pages/point-book-edit.vue b/src/pages/point-book-edit.vue
index 72b8968..74c75ea 100644
--- a/src/pages/point-book-edit.vue
+++ b/src/pages/point-book-edit.vue
@@ -173,7 +173,7 @@ onMounted(() => {
     </view>
     <view :style="{ marginBottom: '20px' }">
       <SButton :rounded="50" :onClick="onSubmit">
-        {{ currentGroup === groups ? "记完了，提交看分析" : "下一组" }}
+        {{ currentGroup === groups ? "保存并查看分析" : "下一组" }}
       </SButton>
     </view>
   </Container>
diff --git a/src/pages/point-book-list.vue b/src/pages/point-book-list.vue
index fd98683..76b17cc 100644
--- a/src/pages/point-book-list.vue
+++ b/src/pages/point-book-list.vue
@@ -96,10 +96,26 @@ const onSelectOption = (itemIndex, value) => {
       </view>
       <view class="point-records">
         <ScrollList :onLoading="onListLoading">
-          <view v-for="(item, index) in list" :key="item.id">
-            <PointRecord :data="item" :onRemove="onRemoveRecord" />
-            <view v-if="index < list.length - 1" :style="{ height: '25rpx' }"></view>
-          </view>
+          <uni-swipe-action>
+            <block v-for="(item, index) in list" :key="item.id">
+              <uni-swipe-action-item>
+                <template v-slot:right>
+                  <view class="swipe-right" @click="onRemoveRecord(item)">
+                    <image
+                      class="swipe-icon"
+                      src="../static/delete-white.png"
+                      mode="widthFix"
+                    />
+                  </view>
+                </template>
+                <PointRecord :data="item" />
+              </uni-swipe-action-item>
+              <view
+                v-if="index < list.length - 1"
+                :style="{ height: '25rpx' }"
+              ></view>
+            </block>
+          </uni-swipe-action>
           <view class="no-data" v-if="list.length === 0">暂无数据</view>
         </ScrollList>
       </view>
@@ -141,7 +157,7 @@ const onSelectOption = (itemIndex, value) => {
       </SModal>
       <ScreenHint2 :show="showTip">
         <view class="tip-content">
-          <text>确认删除该记录吗</text>
+          <text>确认删除该记录吗?</text>
           <view>
             <button hover-class="none" @click="showTip = false">取消</button>
             <button hover-class="none" @click="confirmRemove">确认</button>
@@ -245,4 +261,17 @@ const onSelectOption = (itemIndex, value) => {
 .tip-content > view > button:last-child {
   background: #fed847;
 }
+/* 右侧滑动按钮（自定义宽度与图标） */
+.swipe-right {
+  width: 120rpx; /* 这里可按需调整按钮宽度 */
+  height: 100%;
+  background-color: #ff7c7c;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.swipe-icon {
+  width: 44rpx;
+  height: 44rpx;
+}
 </style>
diff --git a/src/pages/point-book.vue b/src/pages/point-book.vue
index fb88f43..a3b0884 100644
--- a/src/pages/point-book.vue
+++ b/src/pages/point-book.vue
@@ -363,7 +363,7 @@ onShareTimeline(() => {
         :onClose="() => (showTip = false)"
       />
       <view class="tip-content" v-if="showTip2">
-        <text>确认删除该记录吗</text>
+        <text>确认删除该记录吗？</text>
         <view>
           <button hover-class="none" @click="showTip2 = false">取消</button>
           <button hover-class="none" @click="confirmRemove">确认</button>
@@ -484,6 +484,8 @@ onShareTimeline(() => {
   width: calc(100vw - 70rpx);
   height: calc(100vw - 70rpx);
   transform: scale(0.9);
+  border-radius: 50%;
+  overflow: hidden;
 }
 .heat-map > image {
   width: 100%;
diff --git a/src/static/add-note.png b/src/static/add-note.png
new file mode 100644
index 0000000000000000000000000000000000000000..e641d75b25ba10668f837c2771866ca5296b041c
GIT binary patch
literal 699
zcmeAS@N?(olHy`uVBq!ia0vp^IzX(&!3-q-GkfX*sm1`G5LX~QYu2opcmcA4*|TQ@
z)j~*!CZH@F07VupS_CA4A`sc>)2AaVgKL~IV+KUcw5~IWAeWT{`2{oho&0rK;rjU_
zciyiP*|DI<TA%0h%gI%l(WVmYk7hY&@$cJIR^Yn4DKV%rfXS4BfpNd5i(`nz>9vz@
zPHR>WaOu=o)K@K*Y;rnf{r~?5GLIU&@FdGUvpex}*`<&dZ8LN9bKh`0JhIyN+`p7U
z?vGA0V%A>rZJ4)If9Zag{uTGUzB9FKz9+7ww`nWO!?fVHTn;m<9xs_bjbXp^rR4A>
zf0KmwMKKf_di{J-lKAuTlY5r0D%3UC&1}8J=x60~B|le0DB`ai3rkz<;R=Qrc45XH
zg|;&V^DU2D=zb{R%O|ncuaW(=fCjJdlkCKpT+aRWOc^)l%vgIRG26&q{~mL8)V_n|
zpOeCr7UeTcuT>}$xM1$GCV1+5A>IomtJgoD%+vDaX-CPa;~eqt?;O~DYJG3LSGz#N
zi?E+2TJ^7PzPELMaCA?_@;mb~)8lGb&ux)uxV^`Mk?$1m_h&~;<@1&?37I`Im~wGT
z)+-J}%_+|(pDdWE#5^tKh~Hg?-_tLO9rKu-Z+|tBhlPFiwc^GZnO(vHVehy03t5OR
zW^-jQdw;4-dZOir@9#8c<OuV9$h^mV?(q?0UWXHNZXP+lt9q`JiHvREs{<i5iEo5H
z<$jkF@%3tSmC=p)a`ujgr26+$_cZuzAHJS?repG~TCFnUZ;JO%bN}|QW3Ur7z5e}4
Sp9wGlFnGH9xvX<aXaWFD?@8+b

literal 0
HcmV?d00001

diff --git a/src/static/edit.png b/src/static/edit.png
deleted file mode 100644
index f5837085022c95cf0934006ee5418430ad825319..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 363
zcmeAS@N?(olHy`uVBq!ia0vp^3P7yH!3-ohbF|L_DenNE5LX~Q6AWg70fY@F(FB3q
z88c?U)k7FS5uiAbZPPICInX$Xk|4iehUtGIZMC27SrHd5{P|9ss~qc9gZ_eCA7SN^
zSfHBio-U3d7N^%ve$92rfX8j}jjdPnipBNs|F&N#oT7ME#@S{+*K-jr-xnN;?gzc9
zLyh;JS3Z1c{XeCMuA|;bOZ8tV8nZ6QKC$SZ%M``k^OP<vv#+(`thg?0QgDy`UiO2(
z-yf`rV}2g{U@!k3{q4&+@BEd^6*V~~%p7X4<(2P(qYk$lKNWvSIJ}pSNy|xeiYHI-
z&-==$_5#LR`dVHbzxU6_tULHOAIGk$J{5-9PrrUx@%sIQ8O*W|Shu^0Ounwu6$$hL
NgQu&X%Q~loCIBX-pSA!1

diff --git a/src/static/has-note.png b/src/static/has-note.png
new file mode 100644
index 0000000000000000000000000000000000000000..00a86e331677df893644bfefc9285d8ab349cdaa
GIT binary patch
literal 678
zcmeAS@N?(olHy`uVBq!ia0vp^IzX(&!3-q-GkfX*snP(S5LX~Q6AWg70fY?~fpdY9
zm~4n3TqA@rW5x`)_G#0m0og$D*|TTEwF4Q^Eyh!U7ORy6`2{olDxa>Vc>Th9(L3Cq
z;*WIs+P`~#V#mCRCUr#uXO`(o?aOwxOb@f&(zua<fpM3oi(`nz>9vz@PFt-Y;Cj$S
zW^v&;n-cZk|Ls3^={4VRIqUqMUC_oMa=F)^^Y1pS^7ERz>T0ce+Rb^%Zco0RU-Cup
zQecJWBhiu-XWcWGWoUknymEf=8PAN5b@#XO3M^l@q2RJaidIhFuL)KH`7GKCy4I-j
ze|mewUpzqWtc}-$5>a6m)jMalm{s$Bi#+>UiG$hjuwjehW5rM5XEse<@$c<A{YZt@
zd$O)FI-UK7apkO6k|v7A+)B)Ex^K~5rdnmuw$Q|=;MPHRz9@z3AA2RQ7}iba&cC6%
z@Jcn0n!oy?Jnyfcvi4p(T$)?)cbESiyQOyZGmFJ@*Y(C9Q-7ZncE7{+ke&3!MI{~A
z8rNzzrI{|;+0i)P?tHdIzusnz<DoS#SufR!_H3E7r(QL*NUFzLfBLb6rI!NFPiiz;
z-)g;luh@iMujsu~x7_``a%Pyoy5(EeHF-%al74dj{4HM|^V8c-u)mw%cU8W|`?mR+
ze|uMFb6%>nXOgLYIJ0ewiugy*nhUu#x$?b1txFc?$j%UwPrB>g{5)~9aFWxTd|NAH
zdC#D^-_K_*j<G7zR{i|QO5lD0>mHw)&Ul$4@t^qR9vYvE^3lBvjCTf4S3j3^P6<r_
D4O>9V

literal 0
HcmV?d00001

diff --git a/src/static/tab-mall.png b/src/static/tab-mall.png
index 6f23d0ebc9c13da2538d5cc0feb4d5fcb87b915f..0cbcae30b4e5d0e44b3b35508d8ca8b0ebe911ec 100644
GIT binary patch
literal 3155
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
Ir;CjJ50KC8kpKVy

literal 2912
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
P0D+hpSs2#qJIDP8wv}sW