From 1f329f8b4cb81c3d5aa76f967f6bfc2a32d12a59 Mon Sep 17 00:00:00 2001
From: wenhe <1046926120@qq.com>
Date: Wed, 2 Sep 2026 19:42:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=AC=E8=BF=90=E4=BA=86=E5=8E=9F=E7=89=88?=
 =?UTF-8?q?=E9=A3=9F=E6=9D=90=20=E6=AD=BB=E4=BA=A1=E7=94=9F=E7=89=A9=20?=
 =?UTF-8?q?=E6=89=8B=E5=8A=9E=20=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0=20?=
 =?UTF-8?q?=E6=97=A0bug=20(=E5=8F=AF=E7=94=A8=E7=89=88=E6=9C=AC)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xiangyemod/siwangshengwu/DeadmobData.py   |   8 +++++
 .../siwangshengwu/service/DeadmobService.py   |  29 +++++++++++++++++-
 .../service/DeadmobTimerService.py            |  12 ++++++--
 .../netease_items_res/rtdd_grape.json         |  11 +++++++
 .../netease_items_res/rtdd_orange.json        |  11 +++++++
 .../netease_items_res/rtdd_peach.json         |  11 +++++++
 .../textures/items/grape.png                  | Bin 0 -> 3285 bytes
 resource_pack_Are13Lvd/textures/items/ju.png  | Bin 0 -> 2076 bytes
 .../textures/items/taozi1.png                 | Bin 0 -> 2322 bytes
 tuilun/{ => ok}/手办转化关系.txt              |   0
 10 files changed, 78 insertions(+), 4 deletions(-)
 create mode 100644 resource_pack_Are13Lvd/netease_items_res/rtdd_grape.json
 create mode 100644 resource_pack_Are13Lvd/netease_items_res/rtdd_orange.json
 create mode 100644 resource_pack_Are13Lvd/netease_items_res/rtdd_peach.json
 create mode 100644 resource_pack_Are13Lvd/textures/items/grape.png
 create mode 100644 resource_pack_Are13Lvd/textures/items/ju.png
 create mode 100644 resource_pack_Are13Lvd/textures/items/taozi1.png
 rename tuilun/{ => ok}/手办转化关系.txt (100%)

diff --git a/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/siwangshengwu/DeadmobData.py b/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/siwangshengwu/DeadmobData.py
index 8e0f672..07e7079 100644
--- a/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/siwangshengwu/DeadmobData.py
+++ b/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/siwangshengwu/DeadmobData.py
@@ -458,3 +458,11 @@ DEADMOB_SWITCHES = [
         "giveItem": None,
     },
 ]
+
+# 晾晒计时源方块(挂上鱼后变成这些方块, tick 自动开始晾干):
+# 用于挂鱼时记录玩家, 晾干完成时把 doneTip 发给该玩家。
+DRY_SOURCE_BLOCKS = {
+    "rtdd:hang_meat_hooks_1",
+    "rtdd:hang_meat_hooks_2",
+    "rtdd:meathookcod_2",
+}
diff --git a/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/siwangshengwu/service/DeadmobService.py b/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/siwangshengwu/service/DeadmobService.py
index b9d1eb8..5aad921 100644
--- a/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/siwangshengwu/service/DeadmobService.py
+++ b/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/siwangshengwu/service/DeadmobService.py
@@ -41,8 +41,11 @@ comp = serverApi.GetEngineCompFactory()          # 组件工厂
 from ....BlueFoxTools.SpecialFunciton.BlueFoxSystem import BlueFoxServerSystem
 from ....BlueFoxTools.ToolsConfig import LevelId
 
+# ---- 方块实体数据组件（记录挂鱼玩家, 晾干完成时通知） ----
+blockEntityDataComp = comp.CreateBlockEntityData(LevelId)
+
 # ---- 只导入死亡生物自己的数据库 ----
-from ..DeadmobData import DEADMOB_SWITCHES
+from ..DeadmobData import DEADMOB_SWITCHES, DRY_SOURCE_BLOCKS
 
 # ---- 统一分发器 ----
 from ...service.FeatureDispatcher import FeatureDispatcher
@@ -173,11 +176,35 @@ class DeadmobService(BlueFoxServerSystem):
         # ---- 替换方块 ----
         if recipe.get("target"):
             self.replaceBlock(pos, dim, recipe["target"], playerId)
+            # 挂鱼后目标变成"晾晒计时源" → 记录挂鱼玩家, 晾干完成时通知该玩家
+            if recipe.get("target") in DRY_SOURCE_BLOCKS:
+                self.recordDryingPlayer(pos, dim, playerId)
 
         # ---- 转换成功提示 ----
         if recipe.get("tip"):
             comp.CreateMsg(playerId).NotifyOneMessage(playerId, recipe["tip"])
 
+    # ============================================================================
+    # 四、工具方法：记录晾晒玩家（挂鱼时写入方块实体, 供计时完成通知）
+    # ============================================================================
+
+    def recordDryingPlayer(self, pos, dim, playerId):
+        """挂鱼后延迟0.1秒把玩家写入新方块实体数据, 晾干完成时通知该玩家。
+        SetBlockNew 后新方块 block entity 需要初始化时间, 立即写可能失败。"""
+        try:
+            comp.CreateGame(LevelId).AddTimer(0.1, self._writeDryingPlayer, pos, dim, playerId)
+        except Exception:
+            pass
+
+    def _writeDryingPlayer(self, pos, dim, playerId):
+        """延迟写回调：把玩家写入方块实体数据的 rtdd_tp 字段"""
+        try:
+            data = blockEntityDataComp.GetBlockEntityData(dim, pos)
+            if data is not None:
+                data["rtdd_tp"] = playerId
+        except Exception:
+            pass
+
     # ============================================================================
     # 四、工具方法：获取玩家主手物品
     # ============================================================================
diff --git a/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/siwangshengwu/service/DeadmobTimerService.py b/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/siwangshengwu/service/DeadmobTimerService.py
index cc7f963..97626ef 100644
--- a/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/siwangshengwu/service/DeadmobTimerService.py
+++ b/behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/siwangshengwu/service/DeadmobTimerService.py
@@ -147,7 +147,6 @@ class DeadmobTimerService(BlueFoxServerSystem):
                 # 鱼晾干 autoStart=True：挂上后自动补写计时
                 if recipe.get("autoStart", True):
                     self._writeTimerData(dim, pos, recipe, None)
-                    print "[Deadmob-Tick-Start]", blockName, pos
                 return
 
             tstart = blockData["rtdd_tstart"]
@@ -172,7 +171,6 @@ class DeadmobTimerService(BlueFoxServerSystem):
                 return
             # 替换方块
             self.replaceBlock(pos, dim, recipe["target"], None)
-            print "[Deadmob-Tick-Finish]", recipe["source"], "->", recipe["target"], pos
             nextRecipe = self.deadmobTimers.get(recipe["target"])
             if nextRecipe:
                 # 下一级计时（换新的开始时间戳）
@@ -200,7 +198,15 @@ class DeadmobTimerService(BlueFoxServerSystem):
             blockData["rtdd_tid"] = recipe["source"]
             blockData["rtdd_tstart"] = now
             blockData["rtdd_tdur"] = recipe.get("time", 300)
-            blockData["rtdd_tp"] = playerId if playerId else ""
+            # 挂鱼时 DeadmobService 已把玩家写进 rtdd_tp；这里没传玩家则保留，
+            # 保证晾干完成能通知到挂鱼的玩家（创造直接放没有玩家, 不提示）
+            if playerId:
+                blockData["rtdd_tp"] = playerId
+            else:
+                try:
+                    _ = blockData["rtdd_tp"]
+                except Exception:
+                    blockData["rtdd_tp"] = ""
         except Exception:
             pass
 
diff --git a/resource_pack_Are13Lvd/netease_items_res/rtdd_grape.json b/resource_pack_Are13Lvd/netease_items_res/rtdd_grape.json
new file mode 100644
index 0000000..075e548
--- /dev/null
+++ b/resource_pack_Are13Lvd/netease_items_res/rtdd_grape.json
@@ -0,0 +1,11 @@
+{
+  "format_version": "1.10",
+  "minecraft:item": {
+    "description": {
+      "identifier": "rtdd:grape"
+    },
+    "components": {
+      "minecraft:icon": "grape"
+    }
+  }
+}
diff --git a/resource_pack_Are13Lvd/netease_items_res/rtdd_orange.json b/resource_pack_Are13Lvd/netease_items_res/rtdd_orange.json
new file mode 100644
index 0000000..acfbe94
--- /dev/null
+++ b/resource_pack_Are13Lvd/netease_items_res/rtdd_orange.json
@@ -0,0 +1,11 @@
+{
+  "format_version": "1.10",
+  "minecraft:item": {
+    "description": {
+      "identifier": "rtdd:orange"
+    },
+    "components": {
+      "minecraft:icon": "orange"
+    }
+  }
+}
diff --git a/resource_pack_Are13Lvd/netease_items_res/rtdd_peach.json b/resource_pack_Are13Lvd/netease_items_res/rtdd_peach.json
new file mode 100644
index 0000000..1ed846e
--- /dev/null
+++ b/resource_pack_Are13Lvd/netease_items_res/rtdd_peach.json
@@ -0,0 +1,11 @@
+{
+  "format_version": "1.10",
+  "minecraft:item": {
+    "description": {
+      "identifier": "rtdd:peach"
+    },
+    "components": {
+      "minecraft:icon": "peach"
+    }
+  }
+}
diff --git a/resource_pack_Are13Lvd/textures/items/grape.png b/resource_pack_Are13Lvd/textures/items/grape.png
new file mode 100644
index 0000000000000000000000000000000000000000..88f0a08160d0c0a3e5bb2d1e0059c5daef2bfcf3
GIT binary patch
literal 3285
zcmV;`3@Y=9P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000id
z000id0mpBsWB>pPO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>R<o>I+y?e7jKeZ#YO-C
z0s=`yK~#9!q?1ob(_t9LKd<|3Eiy1+L=>(=Nojv@dg)eR$ruG`Ejn}x3L=Q;WJD!(
z?^Z<Dz(W*Cfw3JTT!po{!&+wP+}v7g|9;!r+REY6K{RZe1itXV3-9;&^ZoF=N<>)8
zY5E^gkKG_Wc0=7aZM8(3U5QaG_E6>p0o2ulZDMNPPSP{R-JB@Z$b!wT#C{A?Y0!%%
zY=Jgnl@`9}IxhdTTGG`m;M_MTMw5nKh%#q=fm7SebiPEQ44GYVe8WFgLk7n?ugH+o
z!9aH}o76n*rCS6F=ZWmu!c0qo?v64&0|sfxK%p@at?)gS=jPc<l(lsP16dw;Ixw~R
z(TgVfdVkY(M2X)es%8Q~W8{s8QQsrtl~&x|Swe*b%}o|M3zwPlF7W&r_+6rE7@XdJ
zL$06b!yo&_(=j*s`4}5F>>#E4xOZ-l;9P}a&j?R~cT@ul!uVW~csk4NGyS}uNiq2?
zLnikbZzxZ)R6sAK8t*|>G)BkYk@*p%ed|SHg$ib~34m9hJ`(!s<7N1vTET3|!pW{{
zGIZ)Ffk=h>?#D<qyDU1;d6>6BcTMt&36yH$L#W7XI*ZlXfn)bxLg@sPu?WWX=7!t)
zw}3$i=SoZ^qeLRF30W+Zs#Q|S8N#uNy4@GCi7ba>=LI>mtzZ7VuNG>p-}%n~oPG}N
TTbp9c00000NkvXXu0mjf=44FF

literal 0
HcmV?d00001

diff --git a/resource_pack_Are13Lvd/textures/items/ju.png b/resource_pack_Are13Lvd/textures/items/ju.png
new file mode 100644
index 0000000000000000000000000000000000000000..4afac11b4322422137e6c3ce6a78e47bbc5ef311
GIT binary patch
literal 2076
zcmbVN4Q$j@9Ph>e9ZZ-b3>Jh^W?(?CANSe93Aek09qz_HE@MkvX0Ls>mEE<sYq#A7
zF}N|sL{!2g5fP?gN&o>7oXR3>$PxlF5!jTEC5i?UP@IS(^5yI8c8+gileVw#{oe2Y
z`+vNDU(3x|n3R~7h#*LkE6b4&-($7=i4pKQ<;raizMc$b6)OlbDn+~Fko6lTAjt4O
z(Nm-rxwBbb4(K>R_5xiv5QJz1nL95W<oF7pqFzuYN>=RhzWo>~3RY~1(M`I8c2F*6
z)rCMoU5<yZtKb;{oA(?#H_SqU08lwJ9PmpD8@6H*UKWnEX#ztd5VgXJ*))S_kvkW)
z%OQZ8bR^D`B#oLG9c3~YESA|QP0}PmnhA=;X__TXtWl3fFAQ1>2|hO8u^?&-ep#_{
zRSmKPQBzZ+tI_M^P#Hln3`3AKLDM)y;7YBea$#IjrVTPUfWn8wpeo7|sxfk2xk|NS
zQ0agRfnbbQQlepk0VBd(kf3y==28SG@G)GlD&&tC7kC2rK>$dq0<lyK8!VSqSt*wv
zKpk7Y!vGAe+a0rUUoC+^%!HyktDzgwfZP|Ycxr=y$OnpC72<)j8p@oec@t#qA;76}
z$Ro@C!9?W_N=9i~N1`*9h>{@JC>cXG00*Z6D+aTs$4LWDQ688z+RW1AEYiY~<N(wy
z3!<;~UZ|d>46M;~2Naf!z^U9L!2-|v<WPWv4vPV<3=l!73`1jKWbLwF4nf0Eoqp)N
z%WlsN$v)8!7nJ;knW)QYH&Kkqgwr}IBG>I^U6P`55)WJsD+Yt36Ged)0ANVHk-`~<
zv*09WFyda0(c?bKNArw<rWu+U-0zV2Dy;;x{R5{#ka@`QpF9KUH44DX<Gh(RK_UZ<
zb2RP4DI=uQTYS7lfU+a`XBUS=cpy3dP*zQq02xV=)6*ue5w{2?1~)PW0rvtkOoqkm
zV>rEmF<W@8><5^#L<Q!!HhPc>KxK5~7tu)ZupF-)3M<BI)c^!6IxXHO9*<=?y1%9z
zK+=a)$$)i5_Ng^o2-wPC>>gQ##Dl~uT=m1HKVB*aG~FxxuB!b%(xYMF%Q>kGzz$1b
znlpsfiw2TH+?}t;+K|3A2#3v38^*dY{D}2&AVKO7?9vySrd~ymxZ^H|&0|^JvUZM~
zVjI`E|DBSZ=1$Y<MzT38Ilk{LB+uruznb8TpSL2>b}i|~Gbc8`g1OVvHfOEcduUpI
zeM85=c1v;F&L6%Qx2C7^(y=A$y@vit?<rj`Jc}JIsMGyb8Q<cm%;{dbEw3bC^gX?0
zO=EJd<NMmY<P|R!jch*iX6H@Ua<Tm6v9+z0tP{nSFDqWtiKim(7H?0^_J>=4<bTV%
z*s!<VKm1Hrs?hhw^GzMyV-876i)W51J3E@HU$yJ+&bZvgJ?9TkOgOS}c5hYktj`zq
z^&R-mv+kRhJ2EQTwhlXR@H#U;`J5xs^y!RQmeYS;+uf2P7Oor39_d@mT$`|mYC1bH
z1F>{_Q|#k?%Wwa3<yZgf!uXyZ$91aYM0)o7yUAN~ey^<O2wR0yYOL#>o>qT8v1G@$
z+3_<EPi{!Km2}Eq-}~7I-ACid@r%+rEEo19tc>5ZEU_zYZP%{g$8T@>qyKpG_WA1%
zZkqb_2y9qszj5QR($kYucYfHoGSjxKCHu;Pt)||dmO}l8ePchlp4wE1W}Zr^uNLFy
z0`79d$mXZUoV!%;QDNK7N$JS&@V4`nm($y?_GGm0Hh=j~t33H<<U;A{>0jOQ*Y%%l
cyLe+t>rbcC&K@XTsQtfP&K$>%%opqb1#R!n&;S4c

literal 0
HcmV?d00001

diff --git a/resource_pack_Are13Lvd/textures/items/taozi1.png b/resource_pack_Are13Lvd/textures/items/taozi1.png
new file mode 100644
index 0000000000000000000000000000000000000000..538e469add61e7b6f11ca12d19c1c32fb0fd4782
GIT binary patch
literal 2322
zcmb_e4Nw$S9A8wxP(XxHD<`*gQWE#}<Mxi-jRWxx`Ow1yPQ<3B_ICH~cDTDecNY#Q
z9Yv=}jm$8=GNne1K1M4?oMH?KKS!Oc!OS$BEXHZ1ASpo`tarz8q2b3g-OS#;eed^v
z|KI=re(&wBvK8jW$2}4UK~Q{to~0Pv#|5v^G2nkn&tDw4J><_@q(ab`<lq$rZP_{r
zf?__G>}6V+bso#hUL7aM4pCR-^#e2nWn@+PIlf%fV29|Ed?uu;xdnkG!GtU{SaGZ0
zEV`w<8bvIrDYWx7<vb%GS($J~6$=QwqQ=2hUXM>@t4v6Umj&%$H-^9=h*oYwvV#HP
zGOG<X%ZdmabvVl7I0>gSI>Ja%G(8h0aT3Sybd11Jl4NlsYtX~t9|EE&f|D(_%n8Q=
zPbS2zX?_;N0)c=opx4QY3nLhY!Eh2INfaPZwc4j~Rj5y$I>=xVRbG+&nk4(+AS36H
zD>M@Vln$ie^+#xZYPd|GU|1FB#|RxBOeq8u_z2Elp?E^U1s)SUqF3~3D!>vEtluqb
zvg(%aLLC{tEdVI3)f$O0tQM~~5<=B-DnT0If((mR?bUt}D;8C`LgB@nN+5G;FdIK>
zRzyyd6}v2Z1{caUC>bV69S)~1lzf65P@fz!L9}q1XhOiM=~0|Q3BnFmjigwTOv7mw
z#|NNRS&*F7cR(3Cj<Xa1>2HGq%Ltst-4`tItW#FJ97tI5axM|``&<YdDI;r^J+cA<
z19keL{rP6IO_80F2MnmixwGN?9J7&Nj7F5y5h1x&E1U0AHO|M2`4$rbildVxfu(tx
zA<}6EHE=wGIvL7<(u^RWf=C!}KHbO>q;YV*MdmAl76{HC*bRcr1CD>>(E`aE^#%eZ
zI0KGy4#36<Mkh+q9APl>yis7tLALpd1U4k+8Oj<|B>+Z-rWi_ah-kWA??9b6<wQB0
zqfv@rNRo3H7$fZr+CJnYHcwK)8drxmQi-@Y-110p$UH2^2RDTY;e&1v1ti=p4O5Q?
ziX5IFaEpNS9xfS(uF6g=z$s$33)JquF2wF8Ugaw9Eu9x=LEwxAln?|xs&`ThD87S0
zX^zxW28!VrJwKTGaMBGltH%dj`(LDo%fh=kpGyQMEQb8|WFE|y11j%G=HFZJ|4Rl7
z9;^cn!|pU+Xl%$K3>Grf1y1&0GxACS50RIW=mT|9z$<5I>#arzin^I^$+pvVJL_A@
zONvsCX7xVtQ^$cFrFmD^&PkCjbULgbuc;l?X&alj_`TZFQPa=PD=h4vUJx6blyo&U
zI(y{?TgrzGt+O^v^Ir3;mc}R7_rBV8VoiL$zgyS4?N8ICt{dA<d|F`X+rG0u?eVAH
zSl?+^Qg>&>=GHsTmp^;$M%u>XUSCvdVoP^N{9|&%ioyk(pV<_Mu2;+IJ}axc**)Qi
zdFsU?$Jz;?`{=oIZ2@KMNqBE!*NB(TH1_mgKDBhY?#6FR8rxrcG3gWqH?G*#@U-iC
zE3&zAL8g6f|A^9GY!3BoYty<mw!!8qT%LHEa-X+dxN>pdqtMsWp@Z&8RJ_!5u$?=!
z%y#VX7rUCzS0*05l>9K;w`5%R+goa1d8xIj=*Xnv@`mqF_rBPycbZeaO_-rfUhL^x
z-&(ytx+9KGSUGS1L0fEH%t~!^j9-baocjW_H6iBov?E1dC4W>hxf5<Wu*+Dw-TX6D
zAlhxN%bm=`nPs-VC^>!6lKxNleLtRiv(Zv8aoM|jc2}O+exc^ew<d0^nUUGtzwVC?
z=bl-}&bb+x)?0Af{11-%nqp?v<g}lBeSFWRDJ{Qlsk6ji?`eVBZz?_VnCG&t^feV-
zKNe?OwLYQYOqzGbH!@N*^84<jwe!uc3GEGC8GCosT>gD^Rc~(nf|{JZkr{^${jfLV
SeeiJuLHRj_mff?Tul*ZvJ1X!1

literal 0
HcmV?d00001

diff --git a/tuilun/手办转化关系.txt b/tuilun/ok/手办转化关系.txt
similarity index 100%
rename from tuilun/手办转化关系.txt
rename to tuilun/ok/手办转化关系.txt