branch-b (#18)

Merge branch 'branch-b' of https://git.rayshift.io/Ceta/magia-assets into branch-b
pull default mikazuki villa char bios

ryoko sakuya memoria typo fixes

default mikazuki villa char bios

mami costume stories - tl by mochi, json by neverarine
720051 swimsuit
720052 winter
720053 haregi

uwasa sana mss - tl & json by ruelin

shizuku hozumi winter costume story - tl by mochi, json by neverarine

Upload files to 'magica/resource/download/asset/master/resource/image_native/scene/download'

nayuta satomi bio

linebreak fixes by vivi

another story arc2 ch1 ep3 - tl by mochi, json by neverarine

final tart mss - tl by bst, json by vivi

tsurufeli mss - tl & json by ruelin

another story arc2 ch1 ep2 - tl by mochi, json by neverarine

510201 tart3 event - tl & json by cett

506113-4.json tart2 event teaser

download waiting screen char bio - sae kirino

ria winter costume story - tl by mochi, json by neverarine

jilly memos 1:
memoria_1431_c
memoria_1434_c
memoria_1604_c
memoria_1605_c
memoria_1606_c

Co-authored-by: Ceta <ctermfin@gmail.com>
Reviewed-on: #18
Co-Authored-By: Ceta <ceta@noreply.localhost>
Co-Committed-By: Ceta <ceta@noreply.localhost>
This commit is contained in:
Ceta 2021-06-25 19:29:20 +01:00 committed by Neo
parent eb8631e746
commit 403c9e164e
133 changed files with 125 additions and 29 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 681 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 681 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 673 KiB

After

Width:  |  Height:  |  Size: 673 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 993 KiB

View file

@ -1,32 +1,4 @@
[
{
"id" : 10254,
"default" : true,
"name" : "Shizuka Tokime",
"desc" : "A Magical Girl from the main family of the Tokime Clan who is their current leader. Born and raised in an isolated rural village, it was decided that she would become a \"Diviner\" (Puella Magi) for the sake of Japan. Its her first time living in the city, so everyone is helping her out. She's been good at fishing since she was young.",
"cv" : "Shuu Uchida"
},
{
"id" : 10264,
"default" : true,
"name" : "Chiharu Hiroe",
"desc" : "A magical girl with a keen sense of smell that belongs to the Tokime clan. She went with her mother to the Tokime village to learn about her bloodline. She's reckless, with a strong sense of justice and a keen nose for evil doings, but in a place with so many incidents and evil going on it could be futile.",
"cv" : "Mayu Sagara"
},
{
"id" : 10274,
"default" : true,
"name" : "Sunao Toki",
"desc" : "A Magical Girl who was once an assassin belonging to the Tokime Clan. She's constantly worrying, considerate, and a good listener. She's adored by the adults in the local villages and towns and loved as an older sister by the younger children. She is still haunted by her past, sometimes seeing dark shadows.",
"cv" : "Aguri Oonishi"
},
{
"id" : 30584,
"default" : true,
"name" : "Ryouko Natsu",
"desc" : "A hot-blooded Magical Girl who grew up in a temple and hates the corruption of the Tokime Clan. Her parents died when she was young, so she was raised by her brutally strict grandfather while living in the \"Joanji\" Temple near Kamihama. She came to Kamihama to passionately support the young girl who's the head of the house.",
"cv" : "Yukina Tomatsu"
},
{
"id": 10011,
"default": true,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -0,0 +1 @@
{"story":{"group_1":[{"armatureList":[{"animation":["action"],"armatureId":1,"filePath":"resource/image_native/effect/story/general/3003_act_stage.ExportJson","zOrder":"charaFront"}],"autoTurnLast":0.2,"bg":"bg_adv_20083.jpg","bgm":"bgm01_anime02","chara":[{"cheek":0,"face":"mtn_ex_010.exp.json","id":402101,"motion":0,"pos":0,"soulGem":0},{"cheek":0,"face":"mtn_ex_000.exp.json","id":402201,"motion":0,"pos":2}],"nameLeft":"Tart","nameRight":"Liz","turnChangeIn":"fadeIn"},{"chara":[{"cheek":0,"face":"mtn_ex_011.exp.json","id":402101,"motion":100}],"textLeft":"Thank you for dinner!","turnChangeOut":"fadeOut"},{"chara":[{"cheek":0,"face":"mtn_ex_010.exp.json","id":402201,"motion":100}],"textRight":"We'll see you tomorrow, then."},{"autoTurnLast":0.2,"chara":[{"cheek":0,"face":"mtn_ex_010.exp.json","id":402101,"motion":0,"pos":0,"soulGem":0},{"cheek":0,"face":"mtn_ex_000.exp.json","id":402201,"motion":1,"pos":2}],"turnChangeIn":"rollInFast"},{"textRight":"...Here's where we'll be staying tonight.","turnChangeOut":"rollOutFast"},{"chara":[{"id":810000,"motion":0,"pos":2,"posX":40,"posY":0}],"nameRight":"Qube","textRight":"This must be the house where that old woman lives."},{"chara":[{"id":402101,"motion":100}],"textLeft":"That's right, Monsieur Angel!"},{"autoTurnLast":0.2,"chara":[{"id":402101,"pos":2}],"textClear":1},{"chara":[{"id":402101,"motion":1}],"nameRight":"Tart","textRight":"Good evening, everyone!"},{"chara":[{"cheek":0,"face":"mtn_ex_050.exp.json","id":800800,"motion":0,"pos":0}],"nameLeft":"","textLeft":"Oh, Jeanette! Welcome!"},{"chara":[{"cheek":0,"face":"mtn_ex_010.exp.json","id":800800}],"textLeft":"We've been expecting you. Come on in!"},{"chara":[{"id":402101,"motion":0}],"textRight":"We're very grateful for your hospitality."},{"chara":[{"cheek":0,"face":"mtn_ex_050.exp.json","id":801400,"motion":0,"pos":0}],"textLeft":"Oh, that voice...is that you, Jeanette?"},{"chara":[{"cheek":0,"face":"mtn_ex_010.exp.json","id":402101,"motion":201}],"textRight":"Oh, hello, ma'am! It's been a while."},{"chara":[{"cheek":0,"face":"mtn_ex_030.exp.json","id":402101}],"textRight":"You didn't have to greet me outside..."},{"chara":[{"face":"mtn_ex_030.exp.json","id":801400}],"textLeft":"*Chuckle* It's fine...I can do at least this much!"},{"chara":[{"face":"mtn_ex_050.exp.json","id":801400}],"textLeft":"...I feel like someone else is here, too?"},{"chara":[{"cheek":0,"face":"mtn_ex_011.exp.json","id":402101,"motion":100}],"textRight":"Yes, meet Liz!"},{"chara":[{"cheek":0,"face":"mtn_ex_000.exp.json","id":402201,"motion":100,"pos":2}],"nameRight":"Liz","textRight":"Good evening, Madame."},{"chara":[{"face":"mtn_ex_011.exp.json","id":801400}],"textLeft":"Are you a friend of Jeanette's?"},{"chara":[{"id":402201,"motion":0}],"textRight":"Yes, I am."},{"textRight":"It's a long story, but Tart―"},{"chara":[{"id":402201,"motion":1}],"textRight":"I mean, Jeanette's family has taken me in for the@time being."},{"chara":[{"face":"mtn_ex_050.exp.json","id":801400}],"textLeft":"Oh my..."},{"textLeft":"I didn't even realize!"},{"chara":[{"face":"mtn_ex_030.exp.json","id":801400}],"textLeft":"My daughter and her husband haven't been around@in quite some time, so..."},{"textLeft":"Jeanette..."},{"textLeft":"Please remind your mother to come visit me more@often."},{"chara":[{"cheek":0,"face":"mtn_ex_050.exp.json","id":402101,"motion":0,"pos":2,"soulGem":0}],"nameRight":"Tart","textRight":"Y-yes, certainly...oh?"},{"chara":[{"cheek":0,"face":"mtn_ex_030.exp.json","id":402101,"lipSynch":0,"motion":300,"soulGem":0}],"textRight":"(Something doesn't feel right...)"},{"bgm":"stop","chara":[{"cheek":0,"face":"mtn_ex_030.exp.json","id":800800,"motion":0,"pos":0}],"textLeft":"Oh..."},{"autoTurnLast":0.2,"chara":[{"id":402101,"pos":0}],"textClear":1},{"chara":[{"cheek":0,"face":"mtn_ex_030.exp.json","id":402201,"motion":300,"pos":2}],"nameRight":"Liz","surround":"7202_telepathy","textRight":"It seems we've been talking past each other.","turnEffect":"ef_adv_02"},{"textRight":"I think I know what's going on..."},{"chara":[{"id":402201,"motion":1}],"textRight":"She must think you're her granddaughter."},{"chara":[{"cheek":0,"face":"mtn_ex_050.exp.json","id":402101,"motion":400}],"nameLeft":"Tart","textLeft":"What?!"},{"autoTurnLast":2.0,"deleteArmatureList":[1],"surround":"stop","turnChangeIn":"fadeIn","turnEffect":"stop"}]},"version":3}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -0,0 +1 @@
{"story":{"group_1":[{"autoTurnLast":0.2,"bg":"bg_adv_20071.jpg","bgm":"bgm05_event05","chara":[{"cheek":0,"face":"mtn_ex_030.exp.json","id":402601,"motion":1,"pos":0},{"cheek":0,"face":"mtn_ex_010.exp.json","id":402301,"motion":0,"pos":2}],"nameLeft":"Elisa","nameRight":"Melissa","narrationBg":"bg_adv_20071.jpg","narrationEffect":"in","turnChangeIn":"fadeIn"},{"nameNarration":"","narration":"*Plod* *Plod*","turnChangeOut":"fadeOut"},{"narrationEffect":"out","textLeft":"The horse's gait is growing heavy."},{"textLeft":"We'll take a rest for now."},{"chara":[{"cheek":0,"face":"mtn_ex_030.exp.json","id":402301}],"textRight":"...Yes."},{"autoTurnLast":1.5,"chara":[{"cheek":0,"face":"mtn_ex_010.exp.json","id":402601,"motion":0,"pos":0},{"cheek":0,"eyeClose":1,"face":"mtn_ex_030.exp.json","id":402301,"motion":0,"pos":2}],"turnChangeIn":"fadeIn"},{"chara":[{"id":402301,"motion":300}],"textRight":"\"Sometimes, an illusion can save us, even though it@isn't real\"...","turnChangeOut":"fadeOut"},{"chara":[{"cheek":0,"face":"mtn_ex_030.exp.json","id":402601,"lipSynch":0}],"textLeft":"..."},{"chara":[{"eyeClose":0,"id":402301}],"textRight":"Do you think Tart's final dream was a happy one?"},{"chara":[{"id":402601,"motion":300}],"textLeft":"...I pray that was the case."},{"textLeft":"Even if it wasn't true salvation, I hope it brought@her joy."},{"chara":[{"id":402301,"motion":0}],"textRight":"...Yes."},{"chara":[{"cheek":0,"face":"mtn_ex_010.exp.json","id":402301}],"textRight":"But I'm glad we traveled this far."},{"chara":[{"id":402301,"motion":1}],"textRight":"I'm glad I got to see, with my own eyes, the path@that Tart had taken,"},{"chara":[{"eyeClose":1,"id":402301}],"textRight":"and that I could hear the recollections of the people@whose lives crossed with hers..."},{"chara":[{"cheek":0,"face":"mtn_ex_020.exp.json","id":402601,"motion":0}],"textLeft":"It's not over yet.@We still have one more place to go."},{"chara":[{"cheek":0,"eyeClose":0,"face":"mtn_ex_030.exp.json","id":402301,"motion":0}],"textRight":"Yes, our final destination..."},{"chara":[{"id":402301,"motion":400}],"textRight":"The village of Domrémy, where Tart was born and@raised. It's so very close."},{"textLeft":"Yeah..."},{"chara":[{"id":402601,"motion":1}],"textLeft":"It's where Tart and Liz first met, too."},{"textRight":"You're right."},{"chara":[{"eyeClose":1,"id":402301,"motion":300}],"textRight":"I'm going to take a good look at it with my own eyes."},{"chara":[{"eyeClose":1,"id":402601,"motion":0},{"eyeClose":0,"id":402301,"motion":0}],"textLeft":"...As will I."},{"chara":[{"cheek":0,"eyeClose":0,"face":"mtn_ex_020.exp.json","id":402601,"motion":200}],"textLeft":"And then we'll return to the frontlines with our@vigor stoked once more."},{"textLeft":"Tart fought and died for the sake of bringing light@back to these skies."},{"chara":[{"id":402601,"motion":0}],"textLeft":"I will not let them go dark again."},{"autoTurnLast":0.2,"bg":"bg_adv_24012.jpg","turnChangeIn":"fadeIn"},{"autoTurnLast":4.0,"turnChangeOut":"fadeOut"},{"autoTurnLast":0.1,"bgm":"stop"},{"autoTurnLast":0.5,"turnChangeIn":"fadeIn","turnChangeInTime":1.5},{"autoTurnFirst":5.0,"bg":"bg_adv_narration.jpg","bgm":"stop","chara":[{"cheek":-1,"eyeClose":0,"face":"mtn_ex_010.exp.json","id":402101,"motion":0,"pos":1,"voice":"vo_char_4021_00_83"}],"nameCenter":"Tart","textCenter":"So you both...came?","turnChangeOut":"fadeOut","turnEffect":"stop"},{"chara":[{"id":402101}]},{"autoTurnLast":2.0,"turnChangeIn":"fadeIn"}]},"version":3}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -0,0 +1 @@
{"story":{"group_1":[{"autoTurnLast":0.01,"bg":"bg_adv_31062.jpg","bgm":"bgm01_anime08","chara":[{"cheek":0,"face":"mtn_ex_010.exp.json","id":831302,"motion":0,"pos":1}],"turnChangeIn":"fadeIn"},{"chara":[{"cheek":0,"face":"mtn_ex_010.exp.json","id":831302,"motion":200,"pos":1}],"nameCenter":"Maiden","textCenter":"...Anyone!","turnChangeOut":"fadeOut"},{"chara":[{"cheek":0,"face":"mtn_ex_011.exp.json","id":831302}],"textCenter":"Is anyone out there?"},{"autoTurnLast":0.25,"chara":[{"id":831302,"pos":0}],"textClear":1},{"chara":[{"cheek":0,"face":"mtn_ex_000.exp.json","id":402201,"motion":1,"pos":2,"soulGem":0}],"nameRight":"Liz","textRight":"You shouldn't raise your voice too much."},{"chara":[{"cheek":0,"face":"mtn_ex_050.exp.json","id":831302,"motion":1,"pos":0}],"nameLeft":"Maiden","textLeft":"Why is that?"},{"chara":[{"id":402201,"soulGem":0}],"nameRight":"Liz","textRight":"Not everyone we meet will be on our side."},{"chara":[{"cheek":0,"face":"mtn_ex_030.exp.json","id":402201,"motion":100,"pos":2,"soulGem":0}],"nameRight":"Liz","textRight":"Just like last time, some people will want to@kill us..."},{"chara":[{"cheek":0,"face":"mtn_ex_050.exp.json","id":402201,"lipSynch":0,"motion":0,"pos":2,"soulGem":0}],"nameRight":"Liz","textRight":"[chara:402201:effect_ef_adv_01][se:7201_detect_magic]...?!"},{"chara":[{"cheek":0,"face":"mtn_ex_020.exp.json","id":402201,"motion":200,"pos":2,"soulGem":0}],"nameRight":"Liz","textRight":"A Witch... It's close!"},{"autoTurnLast":0.1,"bgm":"stop","textClear":1},{"autoTurnLast":2.0,"bg":"bg_adv_46000.jpg","bgChangeEffect":"enterWitchSpace","se":"7208_wander_into"},{"autoTurnLast":0.25,"bgm":"bgm01_anime15","chara":[{"effect":"fadeout","id":402201},{"effect":"fadeout","id":831302}],"textClear":1},{"autoTurnLast":0.1,"bg":"bg_adv_46000.jpg","bgChangeEffect":"cameraPan"},{"autoTurnLast":2.3,"chara":[{"id":6000,"name":"sprite_0","pos":1}],"textClear":1},{"autoTurnLast":0.25,"chara":[{"effect":"fadeout","id":6000,"name":"sprite_0"}],"textClear":1},{"chara":[{"cheek":0,"face":"mtn_ex_050.exp.json","id":101503,"motion":300,"pos":0,"soulGem":0},{"cheek":0,"face":"mtn_ex_050.exp.json","id":304302,"motion":0,"pos":2}],"nameLeft":"Ui","textLeft":"Hey, Sakurako. That Witch..."},{"chara":[{"cheek":0,"face":"mtn_ex_000.exp.json","id":304302,"motion":100,"pos":2}],"nameRight":"Eternal Sakura","textRight":"| ...Yes, I checked the database.@That's a Witch from Kamihama. |"},{"chara":[{"cheek":0,"face":"mtn_ex_050.exp.json","id":831302,"motion":0,"pos":0}],"nameLeft":"Maiden","textLeft":"Kamihama...?"},{"chara":[{"cheek":0,"face":"mtn_ex_000.exp.json","id":402201,"motion":1,"pos":2,"soulGem":0}],"nameRight":"Liz","textRight":"Does that mean it's a Witch from the future?"},{"chara":[{"cheek":0,"face":"mtn_ex_030.exp.json","id":101503,"motion":0,"pos":0,"soulGem":0}],"nameLeft":"Ui","textLeft":"Yeah..."},{"chara":[{"cheek":0,"face":"mtn_ex_030.exp.json","id":402201,"motion":300,"pos":2,"soulGem":0}],"nameRight":"Liz","textRight":"There's a Witch that shouldn't exist in our time..."},{"chara":[{"cheek":0,"face":"mtn_ex_030.exp.json","id":402201,"pos":2,"soulGem":0}],"nameRight":"Liz","textRight":"This place is really starting to feel unreal."},{"autoTurnLast":0.1,"textClear":1},{"autoTurnLast":1.0,"chara":[{"cheek":0,"effect":"ef_adv_05","face":"mtn_ex_020.exp.json","id":402200,"motion":0,"pos":2}],"se":"7205_magic_girl"},{"chara":[{"id":402201,"motion":200}],"nameRight":"Liz","textRight":"No matter what kind of Witch it is,@what we have to do is the same."},{"chara":[{"id":101503,"motion":100,"soulGem":0}],"nameLeft":"Ui","textLeft":"Yeah!"},{"autoTurnLast":0.1,"textClear":1},{"autoTurnLast":1.0,"chara":[{"cheek":0,"effect":"ef_adv_05","face":"mtn_ex_020.exp.json","id":101500,"motion":200,"pos":0}],"se":"7205_magic_girl"},{"autoTurnLast":0.2,"chara":[{"effect":"fadeout","id":402200}],"textClear":1},{"autoTurnLast":0.7,"chara":[{"cheek":0,"face":"mtn_ex_020.exp.json","id":304302,"motion":0,"pos":2}],"textClear":1},{"autoTurnLast":3.2,"chara":[{"cheek":0,"effect":"ef_adv_05","face":"mtn_ex_020.exp.json","id":304300,"motion":100,"pos":2}],"se":"7205_magic_girl","textClear":1},{"autoTurnLast":2.0,"turnChangeIn":"fadeIn"}]},"version":3}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Some files were not shown because too many files have changed in this diff Show more