Skip to content

Commit

Permalink
Format
Browse files Browse the repository at this point in the history
  • Loading branch information
SunsetMkt committed Sep 20, 2022
1 parent 7b98a99 commit 7b10215
Show file tree
Hide file tree
Showing 9 changed files with 63 additions and 42 deletions.
11 changes: 6 additions & 5 deletions css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,23 @@
margin: 0;
padding: 0;
}

/* width */
::-webkit-scrollbar {
width: 10px;
}
/* Track */

/* Track */
::-webkit-scrollbar-track {
background: rgb(255, 255, 255);
}

/* Handle */
::-webkit-scrollbar-thumb {
background: rgb(104, 152, 255);
}
/* Handle on hover */

/* Handle on hover */
::-webkit-scrollbar-thumb:hover {
background: rgb(58, 120, 255);
}
Expand Down
3 changes: 2 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
</li>
<li class="uk-active">
<button class="uk-button uk-button-default" type="button"
onclick="document.fullscreen?document.exitFullscreen():document.documentElement.requestFullscreen()"><span uk-icon="expand"></span></button>
onclick="document.fullscreen?document.exitFullscreen():document.documentElement.requestFullscreen()"><span
uk-icon="expand"></span></button>
</li>
</ul>
</div>
Expand Down
4 changes: 2 additions & 2 deletions js/utility.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ function checkFile(url) {
var xmlHttp = new XMLHttpRequest();
xmlHttp.open("GET", url, false); // false for synchronous request
xmlHttp.send(null);
return xmlHttp.status==200;
return xmlHttp.status == 200;
}

function camelCase(obj) {
var newObj = {};
for (d in obj) {
if (obj.hasOwnProperty(d)) {
newObj[d.replace(/(\_\w)/g, function(k) {
newObj[d.replace(/(\_\w)/g, function (k) {
return k[1].toUpperCase();
})] = obj[d];
}
Expand Down
16 changes: 9 additions & 7 deletions py/generateAudioJsonGlobal.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import os
import json
import os

import requests

from getModelsGlobal import getResourceURL, downloadFile
from getModelsGlobal import downloadFile, getResourceURL

data = {}

Expand All @@ -22,9 +23,10 @@
res = requests.get(resUrl).json()["resources"]
for asset in res:
if "Audio/VOC_JP/" in asset["resource_path"] and "MemorialLobby" in asset["resource_path"]:
keyEvent = ''.join(asset["resource_path"].split("/")[-1].split(".")[:-1])
keyEvent = ''.join(
asset["resource_path"].split("/")[-1].split(".")[:-1])
fname = ''.join(asset["resource_path"].split("/")[-1])

# download ver
if _type:
path = f"./assets/audio/{fname}"
Expand All @@ -39,10 +41,10 @@
downloadFile(baseUrl + "/" + asset["resource_path"], path)
data[keyEvent] = path
else:
# online ver (cors ?)
# online ver (cors ?)
data[keyEvent] = baseUrl + "/" + asset["resource_path"]

with open("./data/audio.json", "w") as f:
json.dump(data, f, indent=4)
print("="*30)
print("Done!")
print("Done!")
16 changes: 9 additions & 7 deletions py/generateAudioJsonJapan.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import os
import json
import os

import requests

from getModelsJapan import getBaseResourceURL, downloadFile
from getModelsJapan import downloadFile, getBaseResourceURL

data = {}

Expand All @@ -23,9 +24,10 @@
res = requests.get(resUrl).json()["Table"]
for asset in res:
if "Audio/VOC_JP/" in res[asset]["path"] and "MemorialLobby" in res[asset]["path"]:
keyEvent = ''.join(res[asset]["path"].split("/")[-1].split(".")[:-1])
keyEvent = ''.join(
res[asset]["path"].split("/")[-1].split(".")[:-1])
fname = ''.join(res[asset]["path"].split("/")[-1])

# download ver
if _type:
path = f"./assets/audio/{fname}"
Expand All @@ -40,10 +42,10 @@
downloadFile(baseUrl + "/" + res[asset]["path"], path)
data[keyEvent] = path
else:
# online ver (cors ?)
# online ver (cors ?)
data[keyEvent] = baseUrl + "/" + res[asset]["path"]

with open("./data/audio.json", "w") as f:
json.dump(data, f, indent=4)
print("="*30)
print("Done!")
print("Done!")
4 changes: 2 additions & 2 deletions py/generateModelsJson.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import os
import json
import os

parentDir = os.listdir("assets/spine/")

Expand All @@ -22,4 +22,4 @@
os.mkdir("./data")

with open("./data/models.json", "w") as f:
json.dump(data, f, indent=6, sort_keys=True)
json.dump(data, f, indent=6, sort_keys=True)
27 changes: 18 additions & 9 deletions py/getModelsGlobal.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import os
from io import BytesIO
import unitypack

import requests
import unitypack
from PIL import ImageOps
import os
import json

# conf
option = {
Expand All @@ -26,6 +26,7 @@
"curr_patch_version": 0
}


def getVersion():
'''
Return Blue Archive build version and build number.
Expand Down Expand Up @@ -61,6 +62,7 @@ def getVersion():
print('Fallback to regex')
# Fallback
import re

# Find all [["*.*.*"]]
ver = re.findall(r'\[\[\"+(\d+(.\d+)+(.\d+))+\"\]\]', src)
print(ver)
Expand All @@ -85,6 +87,7 @@ def updateBaData():
"curr_patch_version": 0
}


def getResourceURL():
'''
Return resource url for Blue Archive
Expand All @@ -93,6 +96,7 @@ def getResourceURL():
print(data)
return data["patch"]["resource_path"]


def getModelsList():
'''
Return list of Blue Archive characters url path.
Expand All @@ -103,14 +107,17 @@ def getModelsList():
for asset in res["resources"]:
if "spinecharacters-" in asset["resource_path"] or "spinelobbies-" in asset["resource_path"]:
# append url and path
data.append('/'.join(res_url.split("/")[0:-1]) + "/" + asset["resource_path"])
data.append('/'.join(res_url.split("/")
[0:-1]) + "/" + asset["resource_path"])
return data


def downloadFile(url, fname):
src = requests.get(url).content
with open(fname, 'wb') as f:
f.write(src)


def extractTextAsset(object, dest):
data = object.read()
if(type(data.script) == bytes):
Expand All @@ -122,6 +129,7 @@ def extractTextAsset(object, dest):
else:
raise Exception("Not handled")


def extractTexture2D(object, dest):
data = object.read()
img = ImageOps.flip(data.image)
Expand All @@ -130,6 +138,7 @@ def extractTexture2D(object, dest):
with open(f"{dest}/{data.name}.png", "wb") as f:
f.write(output.getvalue())


def extractCharacter(src, dest):
with open(src, "rb") as f:
bundle = unitypack.load(f)
Expand All @@ -150,6 +159,7 @@ def extractCharacter(src, dest):
print(data.name + ".png")
extractTexture2D(object, dest)


if __name__ == "__main__":
# make folder
if not(os.path.isdir("./downloaded_resource")):
Expand All @@ -161,8 +171,7 @@ def extractCharacter(src, dest):
if not(os.path.isdir("./data")):
os.makedirs("./data")


ver = getResourceURL() # There are several ResourceURL to a version
ver = getResourceURL() # There are several ResourceURL to a version
print(ver)
if(os.path.isfile("./data/version.txt")):
with open("./data/version.txt", "r") as f:
Expand All @@ -178,13 +187,12 @@ def extractCharacter(src, dest):
with open("./data/version.txt", "w") as f:
f.write(ver[0])


# important
updateBaData()

# get model list
model_list = getModelsList()

# download list of model list
for index, model in enumerate(model_list):
print("="*30)
Expand All @@ -200,7 +208,8 @@ def extractCharacter(src, dest):
continue

# spinecharacters and spinelobbies only
character_name = ''.join(fname.split("spinecharacters-")[1].split("-")[0] if "spinecharacters" in fname else fname.split("spinelobbies-")[1].split("-")[0])
character_name = ''.join(fname.split("spinecharacters-")[1].split("-")[
0] if "spinecharacters" in fname else fname.split("spinelobbies-")[1].split("-")[0])
destExtract = f"./assets/spine/{character_name}"

# skip if already exists
Expand Down
23 changes: 15 additions & 8 deletions py/getModelsJapan.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import os
from io import BytesIO
import unitypack

import requests
import unitypack
from PIL import ImageOps
import os
import json

# conf
option = {
Expand All @@ -15,10 +15,12 @@

ba_api = "https://yostar-serverinfo.bluearchiveyostar.com/r47_50ywch97hfg06o8rom7w.json"


def getVersion():
data = requests.get(ba_api).json()
return data["ConnectionGroups"][0]['OverrideConnectionGroups'][-1]['Name']


def getBaseResourceURL():
'''
Return resource url for Blue Archive
Expand All @@ -28,6 +30,7 @@ def getBaseResourceURL():
return data["ConnectionGroups"][0]['OverrideConnectionGroups'][-1]['AddressablesCatalogUrlRoot']
# https://prod-clientpatch.bluearchiveyostar.com/r47_1_22_46zlzvd7mur326newgu8_2 + /Android/bundleDownloadInfo.json


def getModelsList():
'''
Return list of Blue Archive characters url path.
Expand All @@ -42,11 +45,13 @@ def getModelsList():
data.append(base_url + '/Android/' + asset["Name"])
return data


def downloadFile(url, fname):
src = requests.get(url).content
with open(fname, 'wb') as f:
f.write(src)


def extractTextAsset(object, dest):
data = object.read()
if(type(data.script) == bytes):
Expand All @@ -58,6 +63,7 @@ def extractTextAsset(object, dest):
else:
raise Exception("Not handled")


def extractTexture2D(object, dest):
data = object.read()
img = ImageOps.flip(data.image)
Expand All @@ -66,6 +72,7 @@ def extractTexture2D(object, dest):
with open(f"{dest}/{data.name}.png", "wb") as f:
f.write(output.getvalue())


def extractCharacter(src, dest):
with open(src, "rb") as f:
bundle = unitypack.load(f)
Expand All @@ -86,6 +93,7 @@ def extractCharacter(src, dest):
print(data.name + ".png")
extractTexture2D(object, dest)


if __name__ == "__main__":
# make folder
if not(os.path.isdir("./downloaded_resource")):
Expand All @@ -97,8 +105,7 @@ def extractCharacter(src, dest):
if not(os.path.isdir("./data")):
os.makedirs("./data")


ver = getBaseResourceURL() # There are several ResourceURL to a version
ver = getBaseResourceURL() # There are several ResourceURL to a version
print(ver)
if(os.path.isfile("./data/version.txt")):
with open("./data/version.txt", "r") as f:
Expand All @@ -114,10 +121,9 @@ def extractCharacter(src, dest):
with open("./data/version.txt", "w") as f:
f.write(ver)


# get model list
model_list = getModelsList()

# download list of model list
for index, model in enumerate(model_list):
print("="*30)
Expand All @@ -133,7 +139,8 @@ def extractCharacter(src, dest):
continue

# spinecharacters and spinelobbies only
character_name = ''.join(fname.split("spinecharacters-")[1].split("-")[0] if "spinecharacters" in fname else fname.split("spinelobbies-")[1].split("-")[0])
character_name = ''.join(fname.split("spinecharacters-")[1].split("-")[
0] if "spinecharacters" in fname else fname.split("spinelobbies-")[1].split("-")[0])
destExtract = f"./assets/spine/{character_name}"

# skip if already exists
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@

from setuptools import setup


setup()

0 comments on commit 7b10215

Please sign in to comment.