com.hikky.vketcloudsdk 4.8.10 → 4.8.12

package/LanguageTranslator/TranslationItemName.cs

@@ -630,5 +630,7 @@ namespace HIKKY.VketCloudSDK.Translation
 		Dialog_BuildAndRun_NoWorldSetting,
 		Dialog_BuildAndRun_Close,
 		Dialog_NoPortFound,
+		HEOShadow_ShadowCaster,
+		HEOShadow_ShadowReceiver,
 	}
 }

package/PackageResources/data/AvatarFile/Vketchan_v1.6_MToon_blendshape.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 50266abfdbbeb4237ab90316b2f7d1b5
+guid: 145e84548d5bc47ccad9e014620fde1d
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

package/PackageResources/data/translations/English.asset

@@ -1286,3 +1286,7 @@ MonoBehaviour:
     Text: Close
   - Item: Dialog_NoPortFound
     Text: No Available Port Found.
+  - Item: HEOShadow_ShadowCaster
+    Text: Shadow Caster
+  - Item: HEOShadow_ShadowReceiver
+    Text: Shadow Receiver

package/PackageResources/data/translations/Japanese.asset

@@ -1277,3 +1277,7 @@ MonoBehaviour:
     Text: "\u9589\u3058\u308B"
   - Item: Dialog_NoPortFound
     Text: "\u5229\u7528\u53EF\u80FD\u306A\u30DD\u30FC\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002"
+  - Item: HEOShadow_ShadowCaster
+    Text: "\u30B7\u30E3\u30C9\u30A6\u30AD\u30E3\u30B9\u30BF\u30FC"
+  - Item: HEOShadow_ShadowReceiver
+    Text: "\u30B7\u30E3\u30C9\u30A6\u30EC\u30B7\u30FC\u30D0\u30FC"

package/PackageResources/data/translations/translation.csv

@@ -626,4 +626,6 @@ Dialog_ClearDataCache_ClearCache_Accept,Accept,同意する
 Dialog_ClearDataCache_ClearCache_Cancel,Cancel,キャンセル
 Dialog_BuildAndRun_NoWorldSetting,HEOWorldSetting is not found. Please ensure to place one in the scene.,HEOWorldSettingが見つかりません。シーンに必ず一つ配置してください。
 Dialog_BuildAndRun_Close,Close,閉じる
-Dialog_NoPortFound,No Available Port Found.,利用可能なポートが見つかりません。
+Dialog_NoPortFound,No Available Port Found.,利用可能なポートが見つかりません。
+HEOShadow_ShadowCaster,Shadow Caster,シャドウキャスター
+HEOShadow_ShadowReceiver,Shadow Receiver,シャドウレシーバー

package/PackageResources/project~/data/heliodor_front.js

@@ -5,7 +5,7 @@ const g_GUIdebugTab = document.getElementById('GUIdebugTab');
 const g_GUIdebug = document.getElementById('GUIdebug');
 
 var g_WorldID = "vketmp01";
-var g_MultiPlay = false;
+var g_MultiPlay = true;
 var g_Spot = "";
 var g_ShowWorldSelect = true;
 
@@ -28,13 +28,8 @@ window.addEventListener('keyup', function(event){
 
 }, true);
 
-
 //
 Module['postRun'] = function() {
-	if (g_MultiPlay) {
-		hel_skyway_main();
-	}
-	
 	hel_skyway_start();
 }
 
@@ -156,3 +151,48 @@ function hel_action_bridge(name, text) {
 hel_action_bridge_add(hel_action_bridge);
 
 
+//---------------------------------------------------------------------
+// チャットログのバッジ表示（オーバーライド）
+//
+//  ※hel_skyway_add_text_chat()で標準のバッジ表示を行ってる
+//  ※hel_if_displayChatBadge()は、基本はコメント状態でOK。
+//  ※もし特別なバッジ表示したい場合は、コメントを外してコードを記述する。
+//---------------------------------------------------------------------
+//function hel_if_displayChatBadge()
+//{
+//}
+
+
+// Vketアカウント連携
+function hel_account_isloggedin()
+{
+	const loggedin = hel_out_isLoggedIn();
+	
+	console.log(loggedin ? "loggedin" : "logoff");
+	
+	return loggedin;
+}
+
+async function hel_account_setusernamefromaccount()
+{
+	// プロフィール取得
+	await hel_out_getProfile(window.localStorage.getItem('access-token'))
+	
+	// 名前取得
+	const name = window.localStorage.getItem('name');
+	
+	console.log("name : " + name);
+	
+	// 名前を登録する
+	hel_skyway_set_user_name(name);
+}
+
+function hel_account_openuseofterms()
+{
+	window.open("https://account.vket.com/terms#common", '_blank');
+}
+
+function hel_account_openprivacypolicy()
+{
+	window.open("https://account.vket.com/terms#privacy", '_blank');
+}

package/PackageResources/project~/data/heliodor_vketaccount.js

@@ -0,0 +1,153 @@
+
+// const
+const isTest = window.location.hostname.includes('test') || window.location.hostname.includes('localhost')
+const vketAccountClientId = isTest ? '44xje89RZ1JG_usrvrsdZVMXA-jgM0_P34EffNN-2fk' : ''
+const vketAccountURL = isTest ? 'https://account.hikky.dev' : 'https://account.vket.com'
+
+//
+async function hel_out_initializeAccount() {
+	const params = new URLSearchParams(window.location.search)
+	// code, state がない場合処理終了
+	if (!params.has('code') || !params.has('state')) {
+		// eslint-disable-next-line no-console
+		console.log('no code or state found.')
+		return
+	}
+	// state, ルーム情報がない場合処理終了
+	if (!window.localStorage.getItem('state')) {
+		// eslint-disable-next-line no-console
+		console.log('no state found.')
+		return
+	}
+
+	// state がおかしい
+	if (window.localStorage.getItem('state') != params.get('state')) {
+		// eslint-disable-next-line no-console
+		console.error(
+			`state does not match.`,
+			window.localStorage.getItem('state'),
+			params.get('state')
+		)
+		hel_out_removeStorage()
+		return
+	}
+
+	// ログイン実施
+	const response = await hel_out_issueRefreshToken(params.get('code'))
+	hel_out_updateToken(response)
+	// 一時データ削除
+	window.localStorage.removeItem('state')
+	// プロフィール取得
+	hel_out_getProfile(window.localStorage.getItem('access-token'))
+}
+
+function hel_out_isLoggedIn(refresh = true) {
+	if (!window.localStorage.getItem('refresh-token')) {
+		hel_out_removeStorage()
+		return false
+	}
+	const tokenCreatedAt = window.localStorage.getItem('token-created-at')
+	const tokenExpiresIn = window.localStorage.getItem('token-expires-in')
+	const expiresAt = Number(tokenCreatedAt) * 1000 + Number(tokenExpiresIn) * 1000
+	if (!expiresAt || new Date(expiresAt) < new Date()) {
+		// 有効期限切れ
+		hel_out_removeStorage()
+		return false
+	}
+	if (refresh) {
+		hel_out_getIdToken()
+	}
+
+	return true
+}
+
+function hel_out_removeStorage() {
+	console.log('hel_out_removeStorage')
+	window.localStorage.removeItem('state')
+	window.localStorage.removeItem('refresh-token')
+	window.localStorage.removeItem('token-expires-in')
+	window.localStorage.removeItem('token-created-at')
+	window.localStorage.removeItem('access-token')
+	window.localStorage.removeItem('id-token')
+	window.localStorage.removeItem('vket_id')
+}
+
+async function hel_out_getIdToken() {
+	const response = await hel_out_refreshRefreshToken(
+		window.localStorage.getItem('refresh-token')
+	)
+	hel_out_updateToken(response)
+	return response.id_token
+}
+
+async function hel_out_issueRefreshToken(code) {
+	const formData = new FormData()
+	formData.append('grant_type', 'authorization_code')
+	formData.append('client_id', vketAccountClientId)
+	formData.append('redirect_uri', window.location.href.split('?')[0])
+	formData.append('code', code)
+
+	const response = await fetch(`${vketAccountURL}/oauth/token`, {
+		method: 'POST',
+		body: formData
+	})
+	if (!response.ok) {
+		// eslint-disable-next-line no-console
+		console.error('failed to issue refresh token. status', response.status)
+		return
+	}
+
+	const json = await response.json()
+	return json
+}
+
+async function hel_out_refreshRefreshToken(refreshToken) {
+	const formData = new FormData()
+	formData.append('grant_type', 'refresh_token')
+	formData.append('client_id', vketAccountClientId)
+	formData.append('redirect_uri', window.location.href.split('?')[0])
+	formData.append('refresh_token', refreshToken)
+
+	const response = await fetch(`${vketAccountURL}/oauth/token`, {
+		method: 'POST',
+		body: formData
+	})
+	if (!response.ok) {
+		// eslint-disable-next-line no-console
+		console.error('failed to refresh refresh token. status', response.status)
+		return
+	}
+
+	const json = await response.json()
+	return json
+}
+
+async function hel_out_getProfile(accessToken) {
+	const response = await fetch(`${vketAccountURL}/api/v1/me`, {
+		headers: {
+			Authorization: `Bearer ${accessToken}`,
+			Accept: 'application/json',
+		}
+	})
+	if (!response.ok) {
+		// eslint-disable-next-line no-console
+		console.error('failed to refresh refresh token. status', response.status)
+		return
+	}
+
+	const json = await response.json()
+	window.localStorage.setItem('name', json.name)
+	window.localStorage.setItem('name_en', json.name_en)
+	window.localStorage.setItem('vket_id', json.vket_id)
+	
+	console.log("profile : " + JSON.stringify(json));
+}
+
+function hel_out_updateToken(response) {
+	window.localStorage.setItem('refresh-token', response.refresh_token)
+	window.localStorage.setItem('token-expires-in', response.expires_in)
+	window.localStorage.setItem('token-created-at', response.created_at)
+	window.localStorage.setItem('access-token', response.access_token)
+	window.localStorage.setItem('id-token', response.id_token)
+}
+

package/PackageResources/project~/data/licenselist.html

@@ -0,0 +1,79 @@
+<!doctype html>
+<html lang="ja">
+
+	<head>
+		<meta charset="utf-8">
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta name="viewport" content="width=device-width, user-scalable=no" />
+		<title>License List</title>
+	</head>
+
+	<body>
+		<h1>License List</h1>
+
+		<p>
+Emscripten<br>
+<a href="https://github.com/emscripten-core/emscripten" target="_blank">https://github.com/emscripten-core/emscripten</a>
+<pre>
+Copyright (c) 2010-2014 Emscripten authors, see AUTHORS file.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+</pre>
+		</p>
+<br>
+		<p>
+Open Dynamics Engine<br>
+<a href="http://www.ode.org/" target="_blank">http://www.ode.org/</a>
+<pre>
+Open Dynamics Engine
+Copyright (c) 2001-2007, Russell L. Smith.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+Neither the names of ODE's copyright owner nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+</pre>
+		</p>
+
+	</body>
+</html>
+

package/PackageResources/project~/main.html

@@ -227,6 +227,7 @@
 		<script type="text/javascript" src="data/heliodor_pre.js"></script>
 		<script type="text/javascript" src="data/heliodor_room.js"></script>
 		<script type="text/javascript" src="data/heliodor.js"></script>
+		<script type="text/javascript" src="data/heliodor_vketaccount.js"></script>
 		<script type="text/javascript" src="data/heliodor_front.js"></script>
 		<script type="text/javascript" src="data/heliodor_chatgpt.js"></script>
 		<script src="https://cdn.jsdelivr.net/npm/hls.js@latest"></script>

package/PackageResources/project~/ss.html

@@ -0,0 +1,29 @@
+<!doctype html>
+<html lang="ja">
+
+	<head>
+		<meta charset="utf-8">
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>スクリーンショット</title>
+
+		<script>
+		</script>
+
+	</head>
+
+	<style>
+
+		* {
+			margin: 0;
+			padding: 0;
+		}
+
+	</style>
+
+	<body>
+        <img id="imgSS" style="width:100%;">
+        <script>
+            document.getElementById('imgSS').src = window.localStorage["ssBase64"];
+        </script>
+	</body>
+</html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.hikky.vketcloudsdk",
-  "version": "4.8.10",
+  "version": "4.8.12",
   "displayName": "Vket Cloud SDK",
   "description": "This is the SDK for creating the world in VketCloud.",
   "unity": "2019.4",