Skip to content

Commit

Permalink
new:统一职业窗口大小，技能较多职业新增滚动条，方便分辨率较低用户使用
Browse files Browse the repository at this point in the history
  • Loading branch information
@wxh0402
wxh0402 committed Feb 18, 2021
1 parent 2cf3a59 commit f4f13af
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 16 deletions.
4 changes: 2 additions & 2 deletions Characters/黑暗武士.py
View file
Expand Up @@ -1113,7 +1113,7 @@ def 界面(self):

self.清空排列按钮 = QPushButton('清空排列', self.main_frame2)
self.清空排列按钮.clicked.connect(lambda state: self.清空排列())
self.清空排列按钮.move(850, 630)
self.清空排列按钮.move(850, 400)
self.清空排列按钮.resize(100, 20)
self.清空排列按钮.setStyleSheet(按钮样式)

Expand All @@ -1123,7 +1123,7 @@ def 界面(self):
self.护甲精通选择.addItem('重甲')
self.护甲精通选择.addItem('板甲')
self.护甲精通选择.resize(120,20)
self.护甲精通选择.move(720,630)
self.护甲精通选择.move(720,400)

def 清空排列(self):

Expand Down
16 changes: 8 additions & 8 deletions PublicReference/base.py
View file
Expand Up @@ -1521,7 +1521,7 @@ def 界面(self):
if i.是否有伤害 == 1:
count += 1
self.窗口高度 = max(55 + 30 * count, 680)
self.setFixedSize(1120, self.窗口高度)
self.setFixedSize(1120, 680)
self.输出背景图片 = QPixmap('./ResourceFiles/img/输出背景.png')
super().界面()

Expand Down Expand Up @@ -1756,7 +1756,7 @@ def 界面2(self):
counter=0
for i in ["契约满级","等级调整"," TP等级","释放次数","宠物次数"]:
x=QLabel(i, self.main_frame2)
x.move(横坐标+横坐标偏移量-30+50*counter,纵坐标)
x.move(横坐标+横坐标偏移量-30+50*counter,纵坐标+5)
x.setStyleSheet(标签样式)
counter+=1

Expand Down Expand Up @@ -1886,7 +1886,7 @@ def 界面2(self):

横坐标=480;纵坐标=20;行高=18
x=QLabel("护石Ⅰ", self.main_frame2)
x.move(横坐标,纵坐标 - 6)
x.move(横坐标,纵坐标)
x.setStyleSheet(标签样式)
y = MyQComboBox(self.main_frame2)
y.move(横坐标 + 65,纵坐标)
Expand All @@ -1900,7 +1900,7 @@ def 界面2(self):
for i in range(0,3):
tempstr='符文'+str(i+1) + '选择: '
x=QLabel(tempstr, self.main_frame2)
x.move(横坐标,纵坐标-5)
x.move(横坐标,纵坐标)
x.setStyleSheet(标签样式)
纵坐标+=21
self.符文[i].move(横坐标,纵坐标)
Expand All @@ -1914,7 +1914,7 @@ def 界面2(self):

横坐标=650;纵坐标=20
x=QLabel("护石Ⅱ", self.main_frame2)
x.move(横坐标,纵坐标 - 6)
x.move(横坐标,纵坐标)
x.setStyleSheet(标签样式)
y = MyQComboBox(self.main_frame2)
y.move(横坐标 + 65,纵坐标)
Expand All @@ -1928,7 +1928,7 @@ def 界面2(self):
for i in range(3,6):
tempstr='符文'+str(i+1) + '选择: '
x=QLabel(tempstr, self.main_frame2)
x.move(横坐标,纵坐标-5)
x.move(横坐标,纵坐标)
x.setStyleSheet(标签样式)
纵坐标+=21
self.符文[i].move(横坐标,纵坐标)
Expand All @@ -1940,7 +1940,7 @@ def 界面2(self):

横坐标=820;纵坐标=20
x=QLabel("护石Ⅲ", self.main_frame2)
x.move(横坐标,纵坐标 - 6)
x.move(横坐标,纵坐标)
x.setStyleSheet(标签样式)
y = MyQComboBox(self.main_frame2)
y.move(横坐标 + 65,纵坐标)
Expand All @@ -1954,7 +1954,7 @@ def 界面2(self):
for i in range(6,9):
tempstr='符文'+str(i+1) + '选择: '
x=QLabel(tempstr, self.main_frame2)
x.move(横坐标,纵坐标-5)
x.move(横坐标,纵坐标)
x.setStyleSheet(标签样式)
纵坐标+=21
self.符文[i].move(横坐标,纵坐标)
Expand Down
7 changes: 4 additions & 3 deletions PublicReference/base_buff.py
View file
Expand Up @@ -675,6 +675,7 @@ def __init__(self):

def 界面(self):
self.setFixedSize(1120, 680)
self.窗口高度 = 680
self.行高 = 30
self.输出背景图片 = QPixmap("./ResourceFiles/img/输出背景_BUFF.png")
super().界面()
Expand Down Expand Up @@ -861,23 +862,23 @@ def 界面2(self):


横坐标=395;纵坐标=20;行高=18
x=QLabel("护石(第一栏/上)：", self.main_frame2)
x=QLabel("护石Ⅰ：", self.main_frame2)
x.move(横坐标,纵坐标-5)
x.setStyleSheet(标签样式)
纵坐标+=21
self.护石第一栏.move(横坐标,纵坐标)
self.护石第一栏.resize(130, 行高)

横坐标=565;纵坐标=20
x=QLabel("护石(第二栏/下)：", self.main_frame2)
x=QLabel("护石Ⅱ：", self.main_frame2)
x.move(横坐标,纵坐标-5)
x.setStyleSheet(标签样式)
纵坐标+=21
self.护石第二栏.move(横坐标,纵坐标)
self.护石第二栏.resize(130, 行高)

横坐标=395;纵坐标=70;行高=18
x=QLabel("护石(第三栏/韩)：", self.main_frame2)
x=QLabel("护石Ⅲ：", self.main_frame2)
x.move(横坐标,纵坐标-5)
x.setStyleSheet(标签样式)
纵坐标+=21
Expand Down
23 changes: 20 additions & 3 deletions PublicReference/common.py
View file
Expand Up @@ -331,11 +331,17 @@ def 界面(self):
self.stacked_layout = QStackedLayout(self.main_frame)

self.main_frame1 = QMainWindow()
self.main_frame2 = QMainWindow()
self.main_frame1.setStyleSheet(滚动条样式)
self.main_frame2 = QWidget()
self.main_frame2.setStyleSheet(滚动条样式)
self.main_frame3 = QMainWindow()
self.main_frame3.setStyleSheet(滚动条样式)
self.main_frame4 = QMainWindow()
self.main_frame4.setStyleSheet(滚动条样式)
self.main_frame5 = QMainWindow()
self.main_frame5.setStyleSheet(滚动条样式)
self.main_frame6 = QMainWindow()
self.main_frame6.setStyleSheet(滚动条样式)

self.界面1()
self.界面2()
Expand All @@ -349,7 +355,17 @@ def 界面(self):
def 布局界面(self):
# 把布局界面放进去
self.stacked_layout.addWidget(self.main_frame1)
self.stacked_layout.addWidget(self.main_frame2)
self.main_frame2.setMinimumSize(1120, self.窗口高度)
if self.窗口高度>680:
self.scroll = QScrollArea()
self.main_frame2.setMinimumSize(1100, self.窗口高度-20)
self.scroll.setWidget(self.main_frame2)
# self.scroll.setStyleSheet("QScrollArea {background-color:transparent}")
self.scroll.setStyleSheet(滚动条样式)
self.scroll.viewport().setStyleSheet("background-color:transparent")
self.stacked_layout.addWidget(self.scroll)
else:
self.stacked_layout.addWidget(self.main_frame2)
self.stacked_layout.addWidget(self.main_frame3)
self.stacked_layout.addWidget(self.main_frame4)
if self.初始属性.职业分类 == '输出':
Expand Down Expand Up @@ -1576,7 +1592,8 @@ def 排行界面(self, 筛选 = {}, 显示序号 = [x for x in range(100)]):
详情按钮.setStyleSheet(按钮样式+"QPushButton{font-size:14px}")
详情按钮.setToolTip('<font size="3" face="宋体">点击查看详情</font>')
滚动排行.scroll = QScrollArea()
滚动排行.scroll.setStyleSheet("QScrollArea {background-color:transparent}")
# 滚动排行.scroll.setStyleSheet("QScrollArea {background-color:transparent}")
滚动排行.scroll.setStyleSheet(滚动条样式)
滚动排行.scroll.viewport().setStyleSheet("background-color:transparent")
滚动排行.scroll.setWidget(滚动排行.topFiller)
滚动排行.vbox = QVBoxLayout()
Expand Down

0 comments on commit f4f13af

Please sign in to comment.