forked from Yonokid/YataiDONNijiiro
Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
71a7cf16c7 | ||
|
|
9fd4d2a834 | ||
|
|
8e23c2b4ee | ||
|
|
e174d11a46 | ||
|
|
e5d6c5374b | ||
|
|
6c0de25b1b |
No files matched your search
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -90,5 +90,95 @@
|
|||||||
"x": 989,
|
"x": 989,
|
||||||
"y": 626
|
"y": 626
|
||||||
}
|
}
|
||||||
|
],
|
||||||
|
"shine_clear": [
|
||||||
|
{
|
||||||
|
"x": 232,
|
||||||
|
"y": 349,
|
||||||
|
"crop": [
|
||||||
|
[
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
320,
|
||||||
|
320
|
||||||
|
],
|
||||||
|
[
|
||||||
|
320,
|
||||||
|
0,
|
||||||
|
320,
|
||||||
|
320
|
||||||
|
],
|
||||||
|
[
|
||||||
|
640,
|
||||||
|
0,
|
||||||
|
320,
|
||||||
|
320
|
||||||
|
]
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"x": 1188,
|
||||||
|
"y": 349
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"shine_fc": [
|
||||||
|
{
|
||||||
|
"x": 232,
|
||||||
|
"y": 349,
|
||||||
|
"crop": [
|
||||||
|
[
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
320,
|
||||||
|
320
|
||||||
|
],
|
||||||
|
[
|
||||||
|
320,
|
||||||
|
0,
|
||||||
|
320,
|
||||||
|
320
|
||||||
|
],
|
||||||
|
[
|
||||||
|
640,
|
||||||
|
0,
|
||||||
|
320,
|
||||||
|
320
|
||||||
|
]
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"x": 1188,
|
||||||
|
"y": 349
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"shine_dfc": [
|
||||||
|
{
|
||||||
|
"x": 232,
|
||||||
|
"y": 349,
|
||||||
|
"crop": [
|
||||||
|
[
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
320,
|
||||||
|
320
|
||||||
|
],
|
||||||
|
[
|
||||||
|
320,
|
||||||
|
0,
|
||||||
|
320,
|
||||||
|
320
|
||||||
|
],
|
||||||
|
[
|
||||||
|
640,
|
||||||
|
0,
|
||||||
|
320,
|
||||||
|
320
|
||||||
|
]
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"x": 1188,
|
||||||
|
"y": 349
|
||||||
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -31,6 +31,7 @@
|
|||||||
"width": 1920,
|
"width": 1920,
|
||||||
"height": 1080,
|
"height": 1080,
|
||||||
"options": {
|
"options": {
|
||||||
|
"disable_retry_game": true,
|
||||||
"horizontal_song_select": true,
|
"horizontal_song_select": true,
|
||||||
"one_menu_sort": true,
|
"one_menu_sort": true,
|
||||||
"option_skip_row": true,
|
"option_skip_row": true,
|
||||||
|
|||||||
@@ -57,6 +57,10 @@ function ResultCrown.new(crown_type, is_2p, has_2p)
|
|||||||
self.t_crown = tex.get_texture("result/crown/" .. (crown_names[crown_type] or "crown_clear"))
|
self.t_crown = tex.get_texture("result/crown/" .. (crown_names[crown_type] or "crown_clear"))
|
||||||
self.t_crown_fade = tex.get_texture("result/crown/crown_fade")
|
self.t_crown_fade = tex.get_texture("result/crown/crown_fade")
|
||||||
self.t_gleam = tex.get_texture("result/crown/gleam")
|
self.t_gleam = tex.get_texture("result/crown/gleam")
|
||||||
|
-- crown_loop shine: each crown colour has its own three sweep frames, pieces of that crown's
|
||||||
|
-- art crossed by a diagonal light band
|
||||||
|
local shine_names = { [0] = "shine_clear", [1] = "shine_fc", [2] = "shine_dfc" }
|
||||||
|
self.t_shine = tex.get_texture("result/crown/" .. (shine_names[crown_type] or "shine_clear"))
|
||||||
|
|
||||||
local colours = { [0] = "silver", [1] = "gold", [2] = "rainbow" }
|
local colours = { [0] = "silver", [1] = "gold", [2] = "rainbow" }
|
||||||
local seat = has_2p and (is_2p and "_r" or "_l") or "_c"
|
local seat = has_2p and (is_2p and "_r" or "_l") or "_c"
|
||||||
@@ -127,11 +131,12 @@ function ResultCrown:draw()
|
|||||||
if f >= CROWN_END_F - 5 then
|
if f >= CROWN_END_F - 5 then
|
||||||
local k = (f - (CROWN_END_F - 5)) % (CLOOP_LEN > 1 and CLOOP_LEN or 180)
|
local k = (f - (CROWN_END_F - 5)) % (CLOOP_LEN > 1 and CLOOP_LEN or 180)
|
||||||
local shine, have_table = crown_loop_shine(k)
|
local shine, have_table = crown_loop_shine(k)
|
||||||
|
if not self.t_shine then return end
|
||||||
if shine then
|
if shine then
|
||||||
tex.draw_texture(self.t_gleam,
|
tex.draw_texture(self.t_shine,
|
||||||
{ frame = GL_SHINE[shine], center = true, index = idx })
|
{ frame = GL_SHINE[shine], center = true, index = idx })
|
||||||
elseif not have_table and k < 9 then
|
elseif not have_table and k < 9 then
|
||||||
tex.draw_texture(self.t_gleam,
|
tex.draw_texture(self.t_shine,
|
||||||
{ frame = GL_SHINE[math.floor(k / 3) + 1], center = true, index = idx })
|
{ frame = GL_SHINE[math.floor(k / 3) + 1], center = true, index = idx })
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
+2
-2
@@ -4185,7 +4185,7 @@ d21dc53600bab83b80352bad38cd598d216c6e1279a4d54a0a085ad82ad1430d *./Graphics/res
|
|||||||
684c22481d2a0e4bb2d6dd67b5df87650e081edfeadffcc70c377c393334c06d *./Graphics/result/score/score_shinuchi_en.png
|
684c22481d2a0e4bb2d6dd67b5df87650e081edfeadffcc70c377c393334c06d *./Graphics/result/score/score_shinuchi_en.png
|
||||||
1c160a1a14016ea3a5f761b040db433420476363224011d615613af660e7d0e1 *./Graphics/result/score/score_shinuchi_ja.png
|
1c160a1a14016ea3a5f761b040db433420476363224011d615613af660e7d0e1 *./Graphics/result/score/score_shinuchi_ja.png
|
||||||
89c4d6afafb8010ec4da0b9f72f10f677ec8c87677fcb3d2c9edde923a5b5f9f *./Graphics/result/score/texture.json
|
89c4d6afafb8010ec4da0b9f72f10f677ec8c87677fcb3d2c9edde923a5b5f9f *./Graphics/result/score/texture.json
|
||||||
1a53f6f1d79d40ccd2433a322c01e7ae87e9ba57cf61d237f0e6cd2dcc6052d1 *./Graphics/skin_config.json
|
b295ef692d6c0e4da459bfaea149b1cc919dfb191686bcb39d41d4e92ccd1018 *./Graphics/skin_config.json
|
||||||
a05d23f0997446d4db2b745602bff7fc3d2cdce968a1c24e078684d41cf2982c *./Graphics/song_select/animation.json
|
a05d23f0997446d4db2b745602bff7fc3d2cdce968a1c24e078684d41cf2982c *./Graphics/song_select/animation.json
|
||||||
b74432db46ec6d7ec080fbee6df6029c1451e243d30813fcf597a21704de4e74 *./Graphics/song_select/box/background/0.png
|
b74432db46ec6d7ec080fbee6df6029c1451e243d30813fcf597a21704de4e74 *./Graphics/song_select/box/background/0.png
|
||||||
c6514d44a9bc8e15e8523c5ede7663be3f7ab34f370ea364263ebf73998d0ab8 *./Graphics/song_select/box/background/1.png
|
c6514d44a9bc8e15e8523c5ede7663be3f7ab34f370ea364263ebf73998d0ab8 *./Graphics/song_select/box/background/1.png
|
||||||
@@ -4780,7 +4780,7 @@ d0e71023f6442b34b35e8fa92f34b29960f259c0255bf97ad468467b615808d3 *./Scripts/resu
|
|||||||
49d6b0e063c3afbeb304a1f60d228c2bf7229d4604f08f50ba1382049259592e *./Scripts/song_select/file_navigator/box_back.lua
|
49d6b0e063c3afbeb304a1f60d228c2bf7229d4604f08f50ba1382049259592e *./Scripts/song_select/file_navigator/box_back.lua
|
||||||
57a2328d147455939ebacbcb829fdd398b20e5139dc2ea100839385db4c64aaa *./Scripts/song_select/file_navigator/box_base.lua
|
57a2328d147455939ebacbcb829fdd398b20e5139dc2ea100839385db4c64aaa *./Scripts/song_select/file_navigator/box_base.lua
|
||||||
6bf1a5c3117ae2cdb62add55f1848ffef0b5f3969ae4ea3aa4bd708039c0bf9a *./Scripts/song_select/file_navigator/box_dan.lua
|
6bf1a5c3117ae2cdb62add55f1848ffef0b5f3969ae4ea3aa4bd708039c0bf9a *./Scripts/song_select/file_navigator/box_dan.lua
|
||||||
2554a013f9cd802a677f559060592a8af613e795aa0ccd917615fc05a252be74 *./Scripts/song_select/file_navigator/box_folder.lua
|
8380451cdfe549b8921f9493f671646c348383f3ca45d2aff5ec2321088889a3 *./Scripts/song_select/file_navigator/box_folder.lua
|
||||||
34bf06ec62f9361213086359fc428d21d766ca3f79ff17a4a108bd025ed0950d *./Scripts/song_select/file_navigator/box_song.lua
|
34bf06ec62f9361213086359fc428d21d766ca3f79ff17a4a108bd025ed0950d *./Scripts/song_select/file_navigator/box_song.lua
|
||||||
6df8f4fc78403635889409829d681dae340df45423f019d717d4d8c72aa39c2b *./Scripts/song_select/modifier.lua
|
6df8f4fc78403635889409829d681dae340df45423f019d717d4d8c72aa39c2b *./Scripts/song_select/modifier.lua
|
||||||
e7867c13a618c6f970eaee2826ac6d0efb5539f8b13488dfe5d1c2ece5a81b49 *./Scripts/song_select/option_panel.lua
|
e7867c13a618c6f970eaee2826ac6d0efb5539f8b13488dfe5d1c2ece5a81b49 *./Scripts/song_select/option_panel.lua
|
||||||
|
|||||||
Reference in new issue
Block a user