forked from Yonokid/YataiDONNijiiro
Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
68e07f3c22 | ||
|
|
4acb5411c7 | ||
|
|
b8dcef4fe0 | ||
|
|
32aa418dc5 | ||
|
|
8d7218769e | ||
|
|
be5df5662c | ||
|
|
cd577573ba | ||
|
|
ef06a424e4 |
No files matched your search
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -37,12 +37,17 @@ local function at(track, list, f, n)
|
||||
return track[list][(f % n) + 1]
|
||||
end
|
||||
|
||||
-- whole pixels: drawn between pixels, the filtered layers came out soft
|
||||
local function px(v)
|
||||
return math.floor(v + 0.5)
|
||||
end
|
||||
|
||||
-- a strip whose x / y follow its track; rows above the top band are cut off
|
||||
function TutorialBackground:strip(name, track_name, f)
|
||||
local tr = TRACKS[track_name]
|
||||
local x = at(tr, "x", f, tr.n)
|
||||
local x = px(at(tr, "x", f, tr.n))
|
||||
local y = name == "pat" and 0 or (name == "mtn" and 0 or at(tr, "y", f, 120))
|
||||
local top = y + L[name].ytop
|
||||
local top = px(y + L[name].ytop)
|
||||
local cut = math.max(0, BAND_TOP - top)
|
||||
tex.draw_texture(self.id[name], {
|
||||
x = x, y = top + cut, y2 = -cut,
|
||||
@@ -70,7 +75,7 @@ function TutorialBackground:draw_back()
|
||||
local cx = at(TRACKS.cloud, "x", f, TRACKS.cloud.n)
|
||||
local cy = at(TRACKS.c9, "y", f, 120) - CLOUD_Y0
|
||||
for k = 0, CLOUD_COUNT - 1 do
|
||||
tex.draw_texture(self.id.cloud, { x = cx + CLOUD_X0 + CLOUD_PITCH * k + L.cloud.dx, y = cy + L.cloud.dy })
|
||||
tex.draw_texture(self.id.cloud, { x = px(cx + CLOUD_X0 + CLOUD_PITCH * k + L.cloud.dx), y = px(cy + L.cloud.dy) })
|
||||
end
|
||||
self:strip("w13", "w13", f)
|
||||
self:strip("w16", "w16", f)
|
||||
|
||||
@@ -26,6 +26,15 @@ local SORT_FOLDER_NAMES = { ["曲検索"] = true, ["Search Song"] = true, ["搜
|
||||
["むずかしさからえらぶ"] = true, ["Diff Sort"] = true }
|
||||
local FOLDER_FRAME_EVENT, FOLDER_FRAME_SORT, FOLDER_FRAME_DANI = 11, 12, 10
|
||||
|
||||
-- The tutorial folder (GENRE:TUTORIAL, genre index 0) is a howto board: the recent
|
||||
-- board's colours with its own characters (box_chara frame 10).
|
||||
local GENRE_TUTORIAL = 0
|
||||
local FOLDER_FRAME_HOWTO, CHARA_FRAME_HOWTO = 9, 10
|
||||
|
||||
local function is_tutorial(box)
|
||||
return box.genre_index ~= nil and box:genre_index() == GENRE_TUTORIAL
|
||||
end
|
||||
|
||||
local SORT_COLLECTIONS = { SEARCH = true, DIFFICULTY = true }
|
||||
local EVENT_COLLECTIONS = { NEW = true, RECOMMENDED = true }
|
||||
|
||||
@@ -39,6 +48,7 @@ local function folder_frame(box)
|
||||
end
|
||||
if box.kind and box:kind() == "dan" then return FOLDER_FRAME_DANI, false end
|
||||
if n and SORT_FOLDER_NAMES[n] then return FOLDER_FRAME_SORT, false end
|
||||
if is_tutorial(box) then return FOLDER_FRAME_HOWTO, false end
|
||||
return box:genre_frame(), false
|
||||
end
|
||||
|
||||
@@ -115,7 +125,7 @@ function SongSelect:draw_folder_board(box, pb, ch_alpha, ch_off, ta, glow_a)
|
||||
-- characters: texture has L at x=510 and R at x=1410
|
||||
if ch_alpha > 0 then
|
||||
local slide = 450.0 - ch_off
|
||||
local gframe = box:genre_frame()
|
||||
local gframe = is_tutorial(box) and CHARA_FRAME_HOWTO or box:genre_frame()
|
||||
tex.draw_texture(self._id_box_chara, { frame = gframe, x = bx - 960 + slide, y = by - 240, x2 = 960 - 1920, fade = fade * ch_alpha,
|
||||
src = { x = 0, y = 0, width = 960, height = 480 } })
|
||||
tex.draw_texture(self._id_box_chara, { frame = gframe, x = bx - slide, y = by - 240, x2 = 960 - 1920, fade = fade * ch_alpha,
|
||||
|
||||
+30
-3
@@ -4209,7 +4209,7 @@ d21dc53600bab83b80352bad38cd598d216c6e1279a4d54a0a085ad82ad1430d *./Graphics/res
|
||||
684c22481d2a0e4bb2d6dd67b5df87650e081edfeadffcc70c377c393334c06d *./Graphics/result/score/score_shinuchi_en.png
|
||||
1c160a1a14016ea3a5f761b040db433420476363224011d615613af660e7d0e1 *./Graphics/result/score/score_shinuchi_ja.png
|
||||
89c4d6afafb8010ec4da0b9f72f10f677ec8c87677fcb3d2c9edde923a5b5f9f *./Graphics/result/score/texture.json
|
||||
7068aaf49f4ed396f38e4776885dd93ff4ee78baa8f5978a24432a5dbfe96ab9 *./Graphics/skin_config.json
|
||||
83aded38cb2f6cfcaa6643be49d34afb9f4064af5558c886682ceffcd5494749 *./Graphics/skin_config.json
|
||||
a05d23f0997446d4db2b745602bff7fc3d2cdce968a1c24e078684d41cf2982c *./Graphics/song_select/animation.json
|
||||
b74432db46ec6d7ec080fbee6df6029c1451e243d30813fcf597a21704de4e74 *./Graphics/song_select/box/background/0.png
|
||||
c6514d44a9bc8e15e8523c5ede7663be3f7ab34f370ea364263ebf73998d0ab8 *./Graphics/song_select/box/background/1.png
|
||||
@@ -4595,7 +4595,7 @@ e514657c28c18d6b913e24b416694cd9e0dc4f61d229b42e423ea62ac5ff69a3 *./Scripts/back
|
||||
d6a27cd79db76d7cdb3fcf70134fadae0679e728f2b2bd615ce4b8c465b44c28 *./Scripts/background/bg_collabs/imas_sidem.lua
|
||||
faf1051b2de0e879b03bf27ceb4241b7536f92571ce8ed828c318089895fda35 *./Scripts/background/bg_collabs/oshiri.lua
|
||||
ea6d17fba190ecd605106d9b12e6fa79311ee637a00c0345f9c425f4286c1b27 *./Scripts/background/bg_collabs/practice.lua
|
||||
db1861b6bd344a022b11e1865104ae76b762e8c8b81cfc7b424c3ab6d2584e47 *./Scripts/background/bg_collabs/tutorial.lua
|
||||
c90eca632c14a4a7d66cd03540ddce2a0dda492e0ab2654b759abf252a9590be *./Scripts/background/bg_collabs/tutorial.lua
|
||||
08d45ec56e2c7fd5e0842d3fda7997c843ac1a1971a3d41255d618799899a508 *./Scripts/background/bg_data/bg_anim/b_001_dai.lua
|
||||
e2f18975cf78f3de351f8459be4c4f6b7b6db54f5efd4589991672c7daf1fa6d *./Scripts/background/bg_data/bg_anim/b_001_f.lua
|
||||
f3b7b0c83c369de1e7cf81aed87354e282819324f12340b612661abbed455d45 *./Scripts/background/bg_data/bg_anim/b_001_n.lua
|
||||
@@ -4806,7 +4806,7 @@ dcc7b7d655cf5d2ea0fc95764bacf7f08f40a35942f8fd5329303a2c11589a3c *./Scripts/resu
|
||||
49d6b0e063c3afbeb304a1f60d228c2bf7229d4604f08f50ba1382049259592e *./Scripts/song_select/file_navigator/box_back.lua
|
||||
47b10e73852684884a19efecce94fbfd066b90bedbe4251495da3f1759d0abb4 *./Scripts/song_select/file_navigator/box_base.lua
|
||||
6bf1a5c3117ae2cdb62add55f1848ffef0b5f3969ae4ea3aa4bd708039c0bf9a *./Scripts/song_select/file_navigator/box_dan.lua
|
||||
26d5bcde2e33a29d2d88728cdcccd13ec299f235e1cfb759d9d109e4a0a7678b *./Scripts/song_select/file_navigator/box_folder.lua
|
||||
efcfa8c68806bd443c8e64209c77f0af558d2e2956b141b780019171c66441af *./Scripts/song_select/file_navigator/box_folder.lua
|
||||
db062d44c9b1b15e66f23c525bd2bc68262c0b4db11a2dc9532bf99a721fd848 *./Scripts/song_select/file_navigator/box_song.lua
|
||||
6df8f4fc78403635889409829d681dae340df45423f019d717d4d8c72aa39c2b *./Scripts/song_select/modifier.lua
|
||||
e7867c13a618c6f970eaee2826ac6d0efb5539f8b13488dfe5d1c2ece5a81b49 *./Scripts/song_select/option_panel.lua
|
||||
@@ -5100,3 +5100,30 @@ c567acc69bf6e9a239e66a195f2d65a7ec6455acff3ee248f4302477d01c193d *./Videos/attra
|
||||
54f561d89b48feff2fa31999e7485e370f2c55b9f360102b2014310078d20fc3 *./Videos/attract_videos/attractdemo_kor.mp4
|
||||
3801f84ff85f56376828abef0b12bd8a1e336b4bc739557bc0ccfa386d79668e *./Videos/op_videos/title.mp4
|
||||
311b9d56a813d76e2f1885d640f5f497af9c7e58740f55f591150567cca85a9c *./Graphics/global/rainbow_transition/rainbow_glow.png
|
||||
7dae02df0392ce513668e4929dee0362f3e3279c097b74dbcbac2a3ef36f706b *./Graphics/background/tutorial_ac/cloud.png
|
||||
d6b007e4fdb3e8dfe259ce8a591956bd3a8073dbfb8eded5c28a6d02b8dba4c9 *./Graphics/background/tutorial_ac/floor.png
|
||||
f8a44f4dc7386da694b3749f1a7b77c88b79bec584bc0cf48bc93a12742be8ab *./Graphics/background/tutorial_ac/mtn.png
|
||||
ff76783f5f03ca095e12b005cad93ef1c91748ddcf27755f16ff53c899851d15 *./Graphics/background/tutorial_ac/pat.png
|
||||
7c4957cbb71eb25e0b09964af536be1ed6d20c673cf4bb2c8e6452dd3b2ae879 *./Graphics/background/tutorial_ac/texture.json
|
||||
14537a9b48e59051eb02ac41cfdbd77afdc5b81eae0ebc1d29cc76c439734d35 *./Graphics/background/tutorial_ac/w13.png
|
||||
abc4af84c1af148b9d245cb2815ca17be12fd44e6d619048a6d8df914bc117d9 *./Graphics/background/tutorial_ac/w16.png
|
||||
14537a9b48e59051eb02ac41cfdbd77afdc5b81eae0ebc1d29cc76c439734d35 *./Graphics/background/tutorial_ac/w21.png
|
||||
1b587c30c522042a6c04290b4998dca36ef84496810bac4ae12648c5337f7eba *./Graphics/background/tutorial_ac/w24.png
|
||||
8bcf5446e8bee1b1e13e7778a875b27771d736b55bc616434e7bc9668f504084 *./Graphics/song_select/box/box_chara/10.png
|
||||
393113431aefde1f2ca5c580295cd15fc744fb8190c0b28ffce57379889616db *./Scripts/background/bg_data/tutorial_ac.lua
|
||||
7a438cb70361275daed4356d23a504ab38d4ac105bf09bd8c1db0e0577dce775 *./Sounds/game/tutorial/balloon.ogg
|
||||
a8c29f3995ecd5b17d0c2fa15f3109d5bae9b9a6c1dbeecf68fa3503beafd94e *./Sounds/game/tutorial/bgm.ogg
|
||||
394eb2c302cc05b99c5f429d6577f766e70bd0dc5b8d3e42cdfbe5b09cc43adf *./Sounds/game/tutorial/burn.ogg
|
||||
7e9aa96b627d633b4d4fc6c82895154626e6a887389c9996cf794967ea3c33d3 *./Sounds/game/tutorial/clear.ogg
|
||||
feb85dd227f4163a0d52aff2c24055b05180a12e21b131a67672dbed5242f4a1 *./Sounds/game/tutorial/sidebody.ogg
|
||||
985cead13844bee272d8ca4fa553c71e8a9ea71bf96cb5ed00521767ff5916a9 *./Sounds/game/tutorial/voice_1.ogg
|
||||
8b8c89e385b77e63c47526a80c8ddb49d189dadf37cedbaeb04149134e7184d0 *./Sounds/game/tutorial/voice_10.ogg
|
||||
03944a76a6df43a6884de10de3600befd1e1681d2190cde9f2b1db1fa808f0c3 *./Sounds/game/tutorial/voice_11.ogg
|
||||
833e6631c8d0eed92b70dbc72d7b5ad4ac17cd23a32177043709e4a48e0f29b0 *./Sounds/game/tutorial/voice_2.ogg
|
||||
2c3e69994a23ac11a234a58395ec8519235cfaa8a92750ac501fc73af8207ab3 *./Sounds/game/tutorial/voice_3.ogg
|
||||
b957627819e2dd9a7b67c47ade85db6e0a6fd7b0842f948b2c5be71ab023e258 *./Sounds/game/tutorial/voice_4.ogg
|
||||
c2a7a67d8a34d56c2dd637272914eb18f74b146dce5f37d1db6835682c2123b7 *./Sounds/game/tutorial/voice_5.ogg
|
||||
a4046d2db366818ac35714ce87f07a6585dc0dcccff6f39657e289abd371e388 *./Sounds/game/tutorial/voice_6.ogg
|
||||
66e028dc414e630b7a81d71c2d8945d4a94a32d8412dedeeb9da08635312ab3f *./Sounds/game/tutorial/voice_7.ogg
|
||||
1ab675193468d54873225537c4cdcbee633c719196f11b88ba97c32358f4def6 *./Sounds/game/tutorial/voice_8.ogg
|
||||
dece64f0558b78944e1df7151ba82d4cf64c19c756eef75852d5b64276c5ba49 *./Sounds/game/tutorial/voice_9.ogg
|
||||
Reference in new issue
Block a user