Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for new indexing system #147

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,454 changes: 1,110 additions & 1,344 deletions package-lock.json

Large diffs are not rendered by default.

114 changes: 57 additions & 57 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,92 +15,92 @@
},
"dependencies": {
"@aresrpg/aresrpg-engine": "2.3.1",
"@aresrpg/aresrpg-protocol": "^5.0.1",
"@aresrpg/aresrpg-sdk": "4.1.7",
"@aresrpg/aresrpg-protocol": "file:../aresrpg-protocol",
"@aresrpg/aresrpg-sdk": "file:../aresrpg-sdk",
"@aresrpg/aresrpg-world": "1.3.9",
"@bufbuild/buf": "1.35.0",
"@bufbuild/protobuf": "1.10.0",
"@bufbuild/protoc-gen-es": "1.10.0",
"@imengyu/vue3-context-menu": "1.4.1",
"@intlify/unplugin-vue-i18n": "4.0.0",
"@mysten/enoki": "0.3.11",
"@mysten/kiosk": "0.9.11",
"@mysten/sui": "1.3.0",
"@mysten/wallet-standard": "0.12.12",
"@mysten/zksend": "0.10.1",
"@bufbuild/buf": "1.42.0",
"@bufbuild/protobuf": "2.1.0",
"@bufbuild/protoc-gen-es": "2.1.0",
"@imengyu/vue3-context-menu": "1.4.2",
"@intlify/unplugin-vue-i18n": "5.0.0",
"@mysten/enoki": "0.4.2",
"@mysten/kiosk": "0.9.18",
"@mysten/sui": "1.9.0",
"@mysten/wallet-standard": "0.13.4",
"@mysten/zksend": "0.11.3",
"@vercel/analytics": "1.3.1",
"@vueuse/core": "10.11.0",
"@vueuse/core": "11.1.0",
"bignumber.js": "9.1.2",
"camera-controls": "2.8.5",
"camera-controls": "2.9.0",
"dat.gui": "0.7.9",
"fast-deep-equal": "3.1.3",
"fast-merge-async-iterators": "1.0.7",
"gsap": "3.12.5",
"iterator-helper": "1.3.4",
"lru-cache": "11.0.0",
"lru-cache": "11.0.1",
"meshoptimizer": "0.21.0",
"ndarray": "1.0.19",
"stats.js": "0.17.0",
"three": "0.166.1",
"three": "0.168.0",
"troika-three-text": "0.49.1",
"v-dropdown": "3.0.0",
"vue": "3.4.33",
"vue-i18n": "9.13.1",
"vue": "3.5.6",
"vue-i18n": "10.0.1",
"vue-next-breakpoints": "1.0.1",
"vue-router": "4.4.0",
"vuesax-alpha": "0.2.0-beta.78"
"vue-router": "4.4.5",
"vuesax-alpha": "0.2.0-beta.79"
},
"devDependencies": {
"@iconify-json/bxs": "^1.1.10",
"@iconify-json/carbon": "^1.1.36",
"@iconify-json/emojione": "^1.1.10",
"@iconify-json/emojione-v1": "^1.1.10",
"@iconify-json/eos-icons": "^1.1.10",
"@iconify-json/ep": "^1.1.15",
"@iconify-json/flat-color-icons": "^1.1.10",
"@iconify-json/fluent": "^1.1.59",
"@iconify-json/fluent-emoji": "^1.1.18",
"@iconify-json/fluent-emoji-high-contrast": "^1.1.15",
"@iconify-json/fxemoji": "^1.1.8",
"@iconify-json/game-icons": "^1.1.9",
"@iconify-json/line-md": "^1.1.38",
"@iconify-json/map": "^1.1.9",
"@iconify-json/material-symbols-light": "^1.1.25",
"@iconify-json/mdi": "^1.1.67",
"@iconify-json/noto": "^1.1.18",
"@iconify-json/oui": "^1.1.2",
"@iconify-json/ph": "^1.1.13",
"@iconify-json/radix-icons": "^1.1.14",
"@iconify-json/streamline-emojis": "^1.1.8",
"@iconify-json/token": "^1.1.6",
"@iconify-json/token-branded": "^1.1.7",
"@iconify-json/twemoji": "^1.1.15",
"@iconify-json/bxs": "^1.2.0",
"@iconify-json/carbon": "^1.2.1",
"@iconify-json/emojione": "^1.2.0",
"@iconify-json/emojione-v1": "^1.2.0",
"@iconify-json/eos-icons": "^1.2.0",
"@iconify-json/ep": "^1.2.0",
"@iconify-json/flat-color-icons": "^1.2.0",
"@iconify-json/fluent": "^1.2.1",
"@iconify-json/fluent-emoji": "^1.2.0",
"@iconify-json/fluent-emoji-high-contrast": "^1.2.0",
"@iconify-json/fxemoji": "^1.2.0",
"@iconify-json/game-icons": "^1.2.0",
"@iconify-json/line-md": "^1.2.1",
"@iconify-json/map": "^1.2.0",
"@iconify-json/material-symbols-light": "^1.2.1",
"@iconify-json/mdi": "^1.2.0",
"@iconify-json/noto": "^1.2.0",
"@iconify-json/oui": "^1.2.0",
"@iconify-json/ph": "^1.2.0",
"@iconify-json/radix-icons": "^1.2.0",
"@iconify-json/streamline-emojis": "^1.2.0",
"@iconify-json/token": "^1.2.0",
"@iconify-json/token-branded": "^1.2.0",
"@iconify-json/twemoji": "^1.2.0",
"@modyfi/vite-plugin-yaml": "^1.1.0",
"@types/dat.gui": "^0.7.13",
"@types/node": "^20.14.11",
"@types/three": "^0.166.0",
"@typescript-eslint/eslint-plugin": "^7.17.0",
"@typescript-eslint/parser": "^7.17.0",
"@vitejs/plugin-vue": "^5.0.5",
"@vue/language-plugin-pug": "^2.0.28",
"eslint": "^8.57.0",
"@types/node": "^22.5.5",
"@types/three": "^0.168.0",
"@typescript-eslint/eslint-plugin": "^8.6.0",
"@typescript-eslint/parser": "^8.6.0",
"@vitejs/plugin-vue": "^5.1.4",
"@vue/language-plugin-pug": "^2.1.6",
"eslint": "^8.57.1",
"eslint-config-prettier": "9.1.0",
"eslint-config-standard": "17.1.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-import": "2.30.0",
"eslint-plugin-node": "^11.1.0",
"events-polyfill": "gist:e2c3b3969513bbd62c1dc2ba2a565fbf",
"husky": "^4.3.8",
"lint-staged": "15.2.7",
"lint-staged": "15.2.10",
"prettier": "3.3.3",
"pug": "^3.0.3",
"stylus": "^0.63.0",
"unplugin-icons": "^0.19.0",
"vite": "^5.3.4",
"unplugin-icons": "^0.19.3",
"vite": "^5.4.6",
"vite-plugin-node-polyfills": "^0.22.0",
"vite-plugin-pwa": "^0.20.0",
"vite-plugin-pwa": "^0.20.5",
"vite-plugin-wasm": "^3.3.0",
"vue-eslint-parser": "^9.4.3",
"vue-tsc": "^2.0.28"
"vue-tsc": "^2.1.6"
},
"husky": {
"hooks": {
Expand Down
Binary file modified src/assets/models/characters/primemachin.glb
Binary file not shown.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
4 changes: 1 addition & 3 deletions src/assets/translations/en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -266,12 +266,9 @@ WALLET_SIGN_MESSAGE: "[AresRPG] This is a verification message to prove that you
SUI_ENOKI_SALT: Enoki failed to deliver the transaction (salt failure). Please try again.
SUI_NO_GAS: You need Sui in your wallet to perform this action
SUI_NOT_ENOUGH_FOOD: You do not have enough food!
SUI_SUBSCRIBED: Connected to Sui
SUI_PET_ALREADY_FED: This pet is not hungry
SUI_INV_NOT_EMPTY: You must unequip all items before that
SUI_SUBSCRIBE_ERROR: The Sui node refused the subscription, please refresh the page to try again
SUI_NO_PERSONAL_KIOSK: This action requires to create a character first
SUI_SUBSCRIBE_START: Subscribing to Sui node...
SUI_FETCHING_DATA: Fetching characters and items..
SUI_DATA_FETCHED: Successfully fetched characters and items
SUI_ENOKI_DOWN: The sponsoring service seems to be malfunctioning, please try again later.
Expand All @@ -282,5 +279,6 @@ WS_FAILED_TO_CONNECT: Failed to connect to the server, check https://status.ares
WS_RECONNECTED: Back online!
WS_CONNECTING_TO_SERVER: Connecting to the server
WS_CONNECTED_TO_SERVER: Connected to the server
WS_NOT_CONNECTED: Not connected to the server

BROWSER_NO_PERF: Your device does not support WebGL or it is running under conditions that would cause major performance issues. Please try on a different device or ensure your browser and drivers are up to date.
4 changes: 1 addition & 3 deletions src/assets/translations/fr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -267,12 +267,9 @@ WALLET_SIGN_MESSAGE: "[AresRPG] Ceci est un message de vérification pour prouve
SUI_ENOKI_SALT: Échec de la transaction par Enoki (échec du salt). Veuillez réessayer.
SUI_NO_GAS: Vous avez besoin de Sui dans votre portefeuille pour effectuer cette action
SUI_NOT_ENOUGH_FOOD: Vous n'avez pas assez de nourriture !
SUI_SUBSCRIBED: Connecté à Sui
SUI_PET_ALREADY_FED: Ce familier n'a pas faim
SUI_INV_NOT_EMPTY: Vous devez déséquiper tous les objets avant cela
SUI_SUBSCRIBE_ERROR: Le nœud Sui a refusé la connection, veuillez actualiser la page pour réessayer
SUI_NO_PERSONAL_KIOSK: Cette action nécessite de créer un personnage d'abord
SUI_SUBSCRIBE_START: Connexion à Sui
SUI_FETCHING_DATA: Récupération des personnages et objets...
SUI_DATA_FETCHED: Personnages et objets récupérés avec succès
SUI_ENOKI_DOWN: Le service de sponsoring semble mal fonctionner, veuillez réessayer plus tard.
Expand All @@ -283,5 +280,6 @@ WS_FAILED_TO_CONNECT: Échec de la connexion au serveur, consultez https://statu
WS_RECONNECTED: De retour en ligne !
WS_CONNECTING_TO_SERVER: Connexion au serveur
WS_CONNECTED_TO_SERVER: Connecté au serveur
WS_NOT_CONNECTED: Vous n'êtes pas connecté au serveur

BROWSER_NO_PERF: Votre appareil ne prend pas en charge WebGL ou fonctionne dans des conditions qui causeraient des problèmes de performance majeurs. Veuillez essayer sur un autre appareil ou vous assurer que votre navigateur et vos pilotes sont à jour.
4 changes: 1 addition & 3 deletions src/assets/translations/jp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -266,12 +266,9 @@ WALLET_SIGN_MESSAGE: "[AresRPG] これはこのアドレスを所有している
SUI_ENOKI_SALT: Enokiのトランザクションに失敗しました(塩の失敗)。もう一度お試しください。
SUI_NO_GAS: このアクションを実行するにはウォレットにSuiが必要です。
SUI_NOT_ENOUGH_FOOD: 十分な食べ物がありません!
SUI_SUBSCRIBED: Suiに接続しました
SUI_PET_ALREADY_FED: このペットはお腹が空いていません
SUI_INV_NOT_EMPTY: その前にすべてのアイテムを解除する必要があります
SUI_SUBSCRIBE_ERROR: Suiノードがサブスクリプションを拒否しました。ページをリフレッシュしてもう一度お試しください。
SUI_NO_PERSONAL_KIOSK: このアクションを実行するにはまずキャラクターを作成する必要があります。
SUI_SUBSCRIBE_START: Suiノードにサブスクライブ中...
SUI_FETCHING_DATA: キャラクターとアイテムを取得中...
SUI_DATA_FETCHED: キャラクターとアイテムを正常に取得しました。
SUI_ENOKI_DOWN: スポンサリングサービスが不具合を起こしているようです。後ほどもう一度お試しください。
Expand All @@ -282,5 +279,6 @@ WS_FAILED_TO_CONNECT: サーバーへの接続に失敗しました。詳細はh
WS_RECONNECTED: オンラインに戻りました!
WS_CONNECTING_TO_SERVER: サーバーに接続中
WS_CONNECTED_TO_SERVER: サーバーに接続しました。
WS_NOT_CONNECTED: サーバーに接続していません

BROWSER_NO_PERF: お使いのデバイスはWebGLをサポートしていないか、パフォーマンス上の大きな問題が発生する状態で実行されています。別のデバイスを試すか、ブラウザとドライバが最新であることを確認してください。
12 changes: 6 additions & 6 deletions src/components/cards/user-character.vue
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,14 @@ async function unselect_character() {
position: relative
z-index: 20

&.iop
background: url('https://assets.aresrpg.world/classe/iop_female.jpg') center / cover
&.senshi
background: url('https://assets.aresrpg.world/classe/senshi_female.jpg') center / cover
&.male
background: url('https://assets.aresrpg.world/classe/iop_male.jpg') center / cover
&.sram
background: url('https://assets.aresrpg.world/classe/sram_female.jpg') center / cover
background: url('https://assets.aresrpg.world/classe/senshi_male.jpg') center / cover
&.yajin
background: url('https://assets.aresrpg.world/classe/yajin_female.jpg') center / cover
&.male
background: url('https://assets.aresrpg.world/classe/sram_male.jpg') center / cover
background: url('https://assets.aresrpg.world/classe/yajin_male.jpg') center / cover

&.locked
border 1px solid #FFCA28
Expand Down
66 changes: 33 additions & 33 deletions src/components/game-ui/character-canvas-display.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,26 @@ const running = ref(false);

const props = defineProps(['type']);

let iop = null;
let sram = null;
let iop_female = null;
let sram_female = null;
let senshi = null;
let yajin = null;
let senshi_female = null;
let yajin_female = null;

let scene = null;
let renderer = null;
const light = new DirectionalLight(0xffffff, 2);
const ambient = new AmbientLight(0xffffff, 1);

function reset_classes() {
iop?.remove();
sram?.remove();
iop_female?.remove();
sram_female?.remove();

iop = null;
sram = null;
iop_female = null;
sram_female = null;
senshi?.remove();
yajin?.remove();
senshi_female?.remove();
yajin_female?.remove();

senshi = null;
yajin = null;
senshi_female = null;
yajin_female = null;
}

function setup_classe(classe) {
Expand All @@ -52,34 +52,34 @@ function setup_classe(classe) {
function display_classe(type) {
reset_classes();
switch (type) {
case 'IOP_MALE':
if (!iop) {
iop = ENTITIES.iop_male({ id: nanoid(), scene_override: scene });
setup_classe(iop);
case 'SENSHI_MALE':
if (!senshi) {
senshi = ENTITIES.senshi_male({ id: nanoid(), scene_override: scene });
setup_classe(senshi);
}
break;
case 'SRAM_MALE':
if (!sram) {
sram = ENTITIES.sram_male({ id: nanoid(), scene_override: scene });
setup_classe(sram);
case 'YAJIN_MALE':
if (!yajin) {
yajin = ENTITIES.yajin_male({ id: nanoid(), scene_override: scene });
setup_classe(yajin);
}
break;
case 'IOP_FEMALE':
if (!iop_female) {
iop_female = ENTITIES.iop_female({
case 'SENSHI_FEMALE':
if (!senshi_female) {
senshi_female = ENTITIES.senshi_female({
id: nanoid(),
scene_override: scene,
});
setup_classe(iop_female);
setup_classe(senshi_female);
}
break;
case 'SRAM_FEMALE':
if (!sram_female) {
sram_female = ENTITIES.sram_female({
case 'YAJIN_FEMALE':
if (!yajin_female) {
yajin_female = ENTITIES.yajin_female({
id: nanoid(),
scene_override: scene,
});
setup_classe(sram_female);
setup_classe(yajin_female);
}
break;
default:
Expand Down Expand Up @@ -132,10 +132,10 @@ onMounted(() => {
requestAnimationFrame(animate);
const delta = clock.getDelta();

iop?.mixer.update(delta);
sram?.mixer.update(delta);
iop_female?.mixer.update(delta);
sram_female?.mixer.update(delta);
senshi?.mixer.update(delta);
yajin?.mixer.update(delta);
senshi_female?.mixer.update(delta);
yajin_female?.mixer.update(delta);

renderer.render(scene, camera);
}
Expand Down
Loading