From 9c4984389477c523cf3bbab847b9afc92b7a067a Mon Sep 17 00:00:00 2001
From: gyjune <gyjune@126.com>
Date: Wed, 28 Aug 2024 11:07:43 +0800
Subject: [PATCH] 1

---
 xbpq.json | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/xbpq.json b/xbpq.json
index 960cdef..48b25a2 100644
--- a/xbpq.json
+++ b/xbpq.json
@@ -396,7 +396,7 @@
 	            }
 	        },
 	 {
-<<<<<<< HEAD
+
 	            "key": "泡沫影院",
 	            "name": "🍉️泡沫影视┃T爽剧",
 	            "type": 3,
@@ -404,7 +404,7 @@
 	            "ext": {
 	                "请求头": "User-Agent$MOBILE_UA",
 	                "编码": "UTF-8",
-	                "主页url": "https://www.gxnuoya.com",
+	                "主页url": "https://www.paomo2025.com/",
 	                "数组": "video-pic loading\"&&</a >",
 	                "图片": "data-original=\"&&\"",
 	                "标题": "title=\"&&\"",
@@ -424,22 +424,11 @@
 	                "搜索链接": "href=\"&&\"",
 	                "搜索副标题": "note text-bg-r\">&&</span>",
 	                "简介": "✨指间的黑客为您介绍剧情:#f5f5f5;\">&&</div>",
-	                "分类url": "https://www.gxnuoya.com/{cateId}/{class}_{area}_{year}__{catePg}.html",
+	                "分类url": "https://www.paomo2025.com/{cateId}/{class}_{area}_{year}__{catePg}.html",
 	                "分类": "电视剧$channel-television#电影$channel-film#动漫$channel-cg#综艺$channel-variety"
 	            }
 	        },
-=======
-            "key": "泡沫影院",
-            "name": "🍉泡沫影视┃T爽剧",
-            "type": 3,
-            "api": "csp_XBPQ",
-            "ext": {
-               
-                "分类url": "https://www.paomo2025.com/{cateId}/{class}_{area}_{year}__{catePg}.html",
-                "分类": "电视剧$channel-television#电影$channel-film#动漫$channel-cg#综艺$channel-variety"
-            }
-        },
->>>>>>> c3e40c8ea96236c2654fdaba22a86ecb78c254ae
+
 	{
 	  "key": " jisu 1",
 	  "name": "🍉️急速影视┃T爽剧",