Merge branch 'smart-shooter-master-0827' into smart-shooter-socket-progress

python/custom_plugins/plugins/detail_template/hongqingting/detail_hongqingting2.py

@@ -238,7 +238,7 @@ class DetailPicGet(DetailBase):
             return
 
     def deal_pic_7(self):
-        if self.get_text_value("场景图"):
+        if self.get_text_value("场景图"): 
             hh_img = PictureProcessing(r"{}\7-1.jpg".format(self.root))
             mote_img = PictureProcessing(self.get_text_value("场景图"))
             mote_img = mote_img.resize(value=896)

python/custom_plugins/plugins/detail_template/huilima/detail_huilima1.py

@@ -146,7 +146,7 @@ class DetailPicGet(DetailBase):
         if self.get_text_value("场景图"):
             mote_img = PictureProcessing(self.get_text_value("场景图"))
             mote_img = mote_img.resize(value=1200)
-            bg_img = PictureProcessing("RGB", (mote_img.width, mote_img.height+mote_img.height), (255,255,255))
+            bg_img = PictureProcessing("RGB", (mote_img.width, mote_img.height), (255,255,255))
             bg_img = bg_img.paste_img(top_img=mote_img,base="nc", value=(0, 0))
             return bg_img
         else:

python/custom_plugins/plugins/detail_template/huilima/detail_huilima2.py

@@ -180,7 +180,7 @@ class DetailPicGet(DetailBase):
         if self.get_text_value("场景图"):
             mote_img = PictureProcessing(self.get_text_value("场景图"))
             mote_img = mote_img.resize(value=1600)
-            bg_img = PictureProcessing("RGB", (mote_img.width, mote_img.height+mote_img.height), (255,255,255))
+            bg_img = PictureProcessing("RGB", (mote_img.width, mote_img.height), (255,255,255))
             bg_img = bg_img.paste_img(top_img=mote_img,base="nc", value=(0, 0))
             return bg_img
         else:

python/custom_plugins/plugins/detail_template/huilima/detail_huilima3.py

@@ -48,8 +48,8 @@ class DetailPicGet(DetailBase):
         self.deal_pic_func_list = [
             self.deal_pic_1,
             self.deal_pic_2,
-            self.deal_pic_22,
-            self.deal_pic_23,
+            self.deal_pic_2_2,
+            self.deal_pic_2_3,
             self.deal_pic_3,
             self.deal_pic_4,
             self.deal_pic_5,
@@ -213,7 +213,7 @@ class DetailPicGet(DetailBase):
         if self.get_text_value("场景图"):
             mote_img = PictureProcessing(self.get_text_value("场景图"))
             mote_img = mote_img.resize(value=1600)
-            bg_img = PictureProcessing("RGB", (mote_img.width, mote_img.height+mote_img.height), (255,255,255))
+            bg_img = PictureProcessing("RGB", (mote_img.width, mote_img.height), (255,255,255))
             bg_img = bg_img.paste_img(top_img=mote_img,base="nc", value=(0, 0))
             return bg_img
         else:

python/custom_plugins/plugins/detail_template/huilima/detail_huilima4.py

@@ -208,7 +208,7 @@ class DetailPicGet(DetailBase):
         if self.get_text_value("场景图"):
             mote_img = PictureProcessing(self.get_text_value("场景图"))
             mote_img = mote_img.resize(value=1600)
-            bg_img = PictureProcessing("RGB", (mote_img.width, mote_img.height+mote_img.height), (255,255,255))
+            bg_img = PictureProcessing("RGB", (mote_img.width, mote_img.height), (255,255,255))
             bg_img = bg_img.paste_img(top_img=mote_img,base="nc", value=(0, 0))
             return bg_img
         else:

python/custom_plugins/plugins/detail_template/huilima/detail_huilima5.py

@@ -397,7 +397,7 @@ class DetailPicGet(DetailBase):
         if self.get_text_value("场景图"):
             mote_img = PictureProcessing(self.get_text_value("场景图"))
             mote_img = mote_img.resize(value=1600)
-            bg_img = PictureProcessing("RGB", (mote_img.width, mote_img.height+mote_img.height), (255,255,255))
+            bg_img = PictureProcessing("RGB", (mote_img.width, mote_img.height), (255,255,255))
             bg_img = bg_img.paste_img(top_img=mote_img,base="nc", value=(0, 0))
             return bg_img
         else: