Merge branch 'main' of https://gitee.com/gyjune/xbpq

# Conflicts:
#	xbpq.json

xbpq.json

@@ -396,6 +396,7 @@
 	            }
 	        },
 	 {
+<<<<<<< HEAD
 	            "key": "泡沫影院",
 	            "name": "🍉️泡沫影视┃T爽剧",
 	            "type": 3,
@@ -427,6 +428,18 @@
 	                "分类": "电视剧$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爽剧",