Skip to content

Commit 15483d4

Browse files
committed
框架跟进
1 parent 14f26f3 commit 15483d4

File tree

9 files changed

+12
-12
lines changed

9 files changed

+12
-12
lines changed

assets/scene/game.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,7 @@ function scene.draw()
777777
end
778778

779779
scene.widgetList={
780-
WIDGET.new{type='button',pos={0,0},x=40,y=60,w=50, sound_press='back',text=CHAR.icon.back,onClick=WIDGET.c_backScn()},
780+
WIDGET.new{type='button',pos={0,0},x=40,y=60,w=50, sound_release='back',text=CHAR.icon.back,onClick=WIDGET.c_backScn()},
781781
WIDGET.new{type='button',pos={0,0},x=100,y=60,w=50,sound_press='key',text=CHAR.icon.retry,onClick=WIDGET.c_pressKey'restart'},
782782
}
783783
return scene

assets/scene/lang.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ scene.widgetList={
7272
WIDGET.new{type='button' ,x=1000,y=330,w=330,h=100,fontSize=40,text='', color='B', sound_press='check'},
7373
WIDGET.new{type='button' ,x=1000,y=450,w=330,h=100,fontSize=40,text='', color='P', sound_press='check'},
7474

75-
WIDGET.new{type='button_fill',x=1000,y=570,w=330,h=100,sound_press='back',fontSize=60,text=CHAR.icon.back,onClick=WIDGET.c_backScn()},
75+
WIDGET.new{type='button_fill',x=1000,y=570,w=330,h=100,sound_release='back',fontSize=60,text=CHAR.icon.back,onClick=WIDGET.c_backScn()},
7676
}
7777

7878
return scene

assets/scene/mapSelect.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,6 @@ scene.widgetList={
177177
WIDGET.new{type='button_fill',pos={0,1},x=320,y=-80,w=80,text=CHAR.icon.retry,color='lB',fontSize=50,onClick=_freshSongList,visibleFunc=function() return love.timer.getTime()-lastFreshTime>2.6 end},
178178
WIDGET.new{type='button_fill',pos={.5,1},y=-80,w=140,h=80,text=CHAR.icon.play,color='lG',fontSize=60,onClick=WIDGET.c_pressKey'return'},
179179
sortSelector,
180-
WIDGET.new{type='button_fill',pos={1,1},x=-120,y=-80,w=160,h=80,sound_press='back',fontSize=60,text=CHAR.icon.back,onClick=WIDGET.c_backScn()},
180+
WIDGET.new{type='button_fill',pos={1,1},x=-120,y=-80,w=160,h=80,sound_release='back',fontSize=60,text=CHAR.icon.back,onClick=WIDGET.c_backScn()},
181181
}
182182
return scene

assets/scene/result.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,6 @@ end
158158

159159
scene.widgetList={
160160
WIDGET.new{type='button_fill',pos={1,1},x=-300,y=-80,w=160,h=80,fontSize=60,text=CHAR.icon.retry,onClick=WIDGET.c_pressKey'restart'},
161-
WIDGET.new{type='button_fill',pos={1,1},x=-120,y=-80,w=160,h=80,sound_press='back',fontSize=60,text=CHAR.icon.back,onClick=WIDGET.c_backScn()},
161+
WIDGET.new{type='button_fill',pos={1,1},x=-120,y=-80,w=160,h=80,sound_release='back',fontSize=60,text=CHAR.icon.back,onClick=WIDGET.c_backScn()},
162162
}
163163
return scene

assets/scene/setting.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ scene.widgetList={
9393

9494
WIDGET.new{type='button_fill',pos={1,1},x=-320,y=-80,w=160,h=80,fontSize=60,text=CHAR.icon.keyboard,onClick=WIDGET.c_goScn'setting_key'},
9595

96-
WIDGET.new{type='button_fill',pos={1,1},x=-120,y=-80,w=160,h=80,sound_press='back',fontSize=60,text=CHAR.icon.back,onClick=WIDGET.c_backScn()},
96+
WIDGET.new{type='button_fill',pos={1,1},x=-120,y=-80,w=160,h=80,sound_release='back',fontSize=60,text=CHAR.icon.back,onClick=WIDGET.c_backScn()},
9797
}
9898

9999
return scene

assets/scene/setting_key.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ scene.widgetList={
180180
WIDGET.new{type='button',pos={0.7777,false},x=0,y=400,w=120,h=60,sound_press='key',fontSize=25,text=LANG'keySetting_dropSpdDn', color='lL',onClick=function() _setSel(19) end},
181181
WIDGET.new{type='button',pos={0.7777,false},x=0,y=480,w=120,h=60,sound_press='key',fontSize=25,text=LANG'keySetting_dropSpdUp', color='lL',onClick=function() _setSel(20) end},
182182

183-
WIDGET.new{type='button_fill',pos={1,1},x=-120,y=-80,w=160,h=80,sound_press='back',fontSize=60,text=CHAR.icon.back,onClick=WIDGET.c_backScn()},
183+
WIDGET.new{type='button_fill',pos={1,1},x=-120,y=-80,w=160,h=80,sound_release='back',fontSize=60,text=CHAR.icon.back,onClick=WIDGET.c_backScn()},
184184
}
185185

186186
return scene

assets/scene/stat.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ scene.widgetList={
5959
end
6060
end
6161
},
62-
WIDGET.new{type='button_fill',pos={1,1},x=-120,y=-80,w=160,h=80,sound_press='back',fontSize=60,text=CHAR.icon.back,onClick=WIDGET.c_backScn()},
62+
WIDGET.new{type='button_fill',pos={1,1},x=-120,y=-80,w=160,h=80,sound_release='back',fontSize=60,text=CHAR.icon.back,onClick=WIDGET.c_backScn()},
6363
}
6464

6565
return scene

main.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,16 @@ do -- WIDGET.newClass
196196
alignDraw(self,self._image)
197197
end
198198
if self._text then
199-
gc_setColor(self.textColor)
199+
gc_setColor(0,0,0,.626)
200200
alignDraw(self,self._text)
201201
end
202202
gc_pop()
203203
end
204204
end
205205
WIDGET.setDefaultOption{
206+
base={
207+
textColor='dL',
208+
},
206209
button={
207210
lineWidth=2,
208211
sound_release='button',
@@ -235,9 +238,6 @@ WIDGET.setDefaultOption{
235238
switch={
236239
labelPos='left',
237240
},
238-
button_fill={
239-
textColor=TABLE.copy(COLOR.D),
240-
},
241241
}
242242
LANG.add{
243243
zh='assets/language/lang_zh.lua',

0 commit comments

Comments
 (0)