com.hikky.vketcloudsdk 9.3.6 → 9.11.1

package/Common/ServerLauncher.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 491ad71a534e847f99793cf1b9ea8781
+guid: f36a606e9671a4ae8a598fe6a893c76c
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

package/Common.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 768392490057b47009d1c1487466edcd
+guid: 46ba040532c3241de9d30c8d1aafbf0b
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

package/PackageResources/Firebase/google-services-desktop.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f0e20762cb0f04b6a9b88869492d2714
+guid: 2a85d3e89ec469741aaca4b7fa14d46e
 TextScriptImporter:
   externalObjects: {}
   userData: 

package/PackageResources/Firebase/google-services.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 818d0fcd863f845018af6a7403fab619
+guid: f7554c3e4b709994caed282bf2ab605e
 TextScriptImporter:
   externalObjects: {}
   userData: 

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

@@ -19,7 +19,7 @@ MonoBehaviour:
   hrmDxt: {fileID: 0}
   thumbnail: {fileID: 2800000, guid: 159a83b9d8667f44f9ac2210be2135b8, type: 3}
   en_thumbnail: {fileID: 2800000, guid: 41f7faeb4e9f7154e8f41dc6c0b26afa, type: 3}
-  id: 0
+  id: -1776
   height: 1
   motions:
   - hem: {fileID: 8549007397814093194, guid: aaaf79bdf66aff747861c8bf99b57445, type: 3}

package/PackageResources/data/translations/English.asset

@@ -1587,7 +1587,7 @@ MonoBehaviour:
   - Item: DebugConsole_UnityOption_ColorSpaceHint
     Text: Please change the version to 2019.4.31f1.
   - Item: DebugConsole_UnityOption_ShaderMessage
-    Text: In the Tier settings of Player settings the quality level of the standard
+    Text: In the Tier settings of Graphics settings the quality level of the standard
       shader is not set to Medium. The appearance after building may be significantly
       different.
   - Item: DebugConsole_UnityOption_ShaderHint

package/PackageResources/data/translations/Japanese.asset

@@ -193,7 +193,7 @@ MonoBehaviour:
   - Item: HEOWorldSetting_Camera_TPSLeft
     Text: "TPS\u5DE6"
   - Item: HEOWorldSetting_Camera_TPSCenter
-    Text: "TSP\u4E2D"
+    Text: "TPS\u4E2D"
   - Item: HEOWorldSetting_Camera_TPSRight
     Text: "TPS\u53F3"
   - Item: HEOWorldSetting_Camera_PhotoRadius
@@ -1579,7 +1579,7 @@ MonoBehaviour:
   - Item: DebugConsole_UnityOption_ColorSpaceHint
     Text: "Color Space\u3092Linear\u306B\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
   - Item: DebugConsole_UnityOption_ShaderMessage
-    Text: "Player\u8A2D\u5B9A\u306ETier\u8A2D\u5B9A\u306B\u304A\u3044\u3066\u3001\u30B9\u30BF\u30F3\u30C0\u30FC\u30C9\u30B7\u30A7\u30FC\u30C0\u30FC\u306E\u54C1\u8CEA\u30EC\u30D9\u30EB\u304CMedium\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30D3\u30EB\u30C9\u5F8C\u306E\u898B\u305F\u76EE\u304C\u5927\u304D\u304F\u7570\u306A\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002"
+    Text: "Graphics\u8A2D\u5B9A\u306ETier\u8A2D\u5B9A\u306B\u304A\u3044\u3066\u3001\u30B9\u30BF\u30F3\u30C0\u30FC\u30C9\u30B7\u30A7\u30FC\u30C0\u30FC\u306E\u54C1\u8CEA\u30EC\u30D9\u30EB\u304CMedium\u306B\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30D3\u30EB\u30C9\u5F8C\u306E\u898B\u305F\u76EE\u304C\u5927\u304D\u304F\u7570\u306A\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002"
   - Item: DebugConsole_UnityOption_ShaderHint
     Text: "\u30B9\u30BF\u30F3\u30C0\u30FC\u30C9\u30B7\u30A7\u30FC\u30C0\u30FC\u306E\u54C1\u8CEA\u3092Medium\u306B\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
   - Item: DebugConsole_EssentialObjects_WorldSettingsMessage

package/PackageResources/data/translations/translation.csv

@@ -88,7 +88,7 @@ HEOWorldSetting_Camera_tps_far_offset_y,Far Offset (y-axis),遠方オフセッ
 HEOWorldSetting_Camera_smoothing,Smoothing,スムーズ
 HEOWorldSetting_Camera_Default_TPS,Default TPS Camera,デフォルトTPSカメラ,
 HEOWorldSetting_Camera_TPSLeft,TPS Left,TPS左,
-HEOWorldSetting_Camera_TPSCenter,TPS Center,TSP中,
+HEOWorldSetting_Camera_TPSCenter,TPS Center,TPS中,
 HEOWorldSetting_Camera_TPSRight,TPS Right,TPS右,
 HEOWorldSetting_Camera_PhotoRadius,Photo Radius,カメラの移動可能半径
 HEOWorldSetting_Camera_RaycastMaxDistance,Raycast Max Distance,レイキャストの最大距離
@@ -776,7 +776,7 @@ DebugConsole_UnityOption_VersionMessage,Your version of Unity is not supported b
 DebugConsole_UnityOption_VersionHint,Please change the version to 2019.4.31f1.,2019.4.31f1にバージョンを変更してください。
 DebugConsole_UnityOption_ColorSpaceMessage,Please set the Color Space to Linear.,Color SpaceがLinearに設定されていません。ビルド後の見た目が大きく異なる可能性があります。
 DebugConsole_UnityOption_ColorSpaceHint,Please change the version to 2019.4.31f1.,Color SpaceをLinearに設定してください。
-DebugConsole_UnityOption_ShaderMessage,In the Tier settings of Player settings the quality level of the standard shader is not set to Medium. The appearance after building may be significantly different.,Player設定のTier設定において、スタンダードシェーダーの品質レベルがMediumに設定されていません。ビルド後の見た目が大きく異なる可能性があります。
+DebugConsole_UnityOption_ShaderMessage,In the Tier settings of Graphics settings the quality level of the standard shader is not set to Medium. The appearance after building may be significantly different.,Graphics設定のTier設定において、スタンダードシェーダーの品質レベルがMediumに設定されていません。ビルド後の見た目が大きく異なる可能性があります。
 DebugConsole_UnityOption_ShaderHint,Please set the quality of the standard shader to Medium.,スタンダードシェーダーの品質をMediumに設定してください。
 DebugConsole_EssentialObjects_WorldSettingsMessage,There is no object with HEOWorldSetting in the scene.,HEOWorldSettingを持つオブジェクトがシーンに存在しません。
 DebugConsole_EssentialObjects_WorldSettingsHint,Please create an object with HEOWorldSetting.,HEOWorldSettingを持つオブジェクトを作成してください。

package/PackageResources/project~/data/Canvas/HeliScript/EC/ECModel.hs

@@ -86,53 +86,52 @@ component ECModel
         m_CartData.TaxIncludedText = _GetTaxIncludedText(currencyCode);
     }
 
-    public void FetchECItemData(int ECItemCode)
+    public void FetchECItemData(int StoreID, string Label)
     {
         m_CurrentSelectedItem = null;
 
-        api.intermediateEcApi.getProduct(_FetchECItemDataCallback, ECItemCode);
+        api.intermediateEcApi.getProductVariantByLabel(_FetchECItemDataCallback, StoreID, Label);
     }
 
     void _FetchECItemDataCallback(JsVal val)
     {
-        if(val === null) return;
+        if(val === null || val.IsNull()) return;
 
-        _CheckError(val, "商品データの取得に失敗しました");
+        // _CheckError(val, "商品データの取得に失敗しました");
 
-        // product
-        JsVal product = val.GetProperty("product");
+        JsVal product = val.GetProperty("productVariantByLabel");
         if(product === null) return;
 
         int id = product.GetProperty("id").GetNum();
-        
-        // shopifyProduct
-        JsVal shopifyProduct = product.GetProperty("shopifyProduct"); 
-        if(shopifyProduct === null) return;
-
-        string title = shopifyProduct.GetProperty("title").GetStr();
-        string description = shopifyProduct.GetProperty("description").GetStr();
 
-        // shopifyProductImages
-        string ThumbnailURL = "gui2023/white.png";
+        string shopifyVariantId = product.GetProperty("shopifyVariantId").GetStr();
+        
+        string currencyCode = product.GetProperty("currencyCode").GetStr();
+        string currencySymbol = _GetCurrencySymbol(currencyCode);
 
-        JsVal shopifyProductImages = shopifyProduct.GetProperty("shopifyProductImages");
-        if(shopifyProductImages === null) return;
+        string Price = product.GetProperty("amount").GetStr();
 
-        list<JsProp> imagesList = shopifyProductImages.GetPropertyList();
-        if(imagesList.Count > 0) ThumbnailURL = imagesList[0].GetValue().GetProperty("url").GetStr();
+        string title = product.GetProperty("title").GetStr();
+        string ThumbnailURL = product.GetProperty("img").GetStr();
+        string description = "";
 
-        // shopifyVariants
-        string Price = "";
-        string shopifyVariantId = "";
+        JsVal shopifyProduct = product.GetProperty("shopifyProduct");
         
-        JsVal shopifyVariants = shopifyProduct.GetProperty("shopifyVariants");
-        if(shopifyVariants === null) return;
-
-        list<JsProp> variantList = shopifyVariants.GetPropertyList();
-        if(variantList.Count > 0)
+        if(shopifyProduct !== null)
         {
-            Price = variantList[0].GetValue().GetProperty("amount").GetStr();
-            shopifyVariantId = variantList[0].GetValue().GetProperty("shopifyVariantId").GetStr();
+            // 商品説明を取得
+            description = shopifyProduct.GetProperty("description").GetStr();
+            
+            if(title == "Default Title" || title.IsEmpty())
+            {
+                JsVal shopifyProductImages = shopifyProduct.GetProperty("shopifyProductImages");
+                list<JsProp> imagesList = shopifyProductImages.GetPropertyList();
+                if(imagesList.Count > 0) ThumbnailURL = imagesList[0].GetValue().GetProperty("url").GetStr();
+            }
+
+            // TextPlaneの機能が足りないのでひとまず名前は常にProductNameを使用する
+            // 機能が増えたらProductNameとValiantsNameを一行ずつ表示するようにする
+            title = shopifyProduct.GetProperty("title").GetStr();
         }
 
         ECItemData data = new ECItemData();
@@ -141,7 +140,7 @@ component ECModel
         data.Name = title;
         data.Desctipt = description;
         data.ThumbnailURL = ThumbnailURL;
-        data.Price = m_CartData.CurrencySymbol + _GetSepalatePriceText(Price.ToInt()) + m_CartData.TaxIncludedText;
+        data.Price = currencySymbol + _GetSepalatePriceText(Price.ToInt()) + m_CartData.TaxIncludedText;
         // 購入数の初期値が0だとワンクリックで購入ができないので１にする
         data.BuyCount = 1;
 
@@ -219,31 +218,37 @@ component ECModel
             JsVal line = linesPropList[i].GetValue();
 
             string merchandiseLineId = line.GetProperty("merchandiseLineId").GetStr();
-            string productTitle = line.GetProperty("productTitle").GetStr();
             int quantity = line.GetProperty("quantity").GetNum();
 
-            // productImages
-            string ThumbnailURL = "gui2023/white.png";
-
-            JsVal productImages = line.GetProperty("productImages");
-            if(productImages === null) continue;
-
-            list<JsProp> imagesList = productImages.GetPropertyList();
-            if(imagesList.Count > 0) ThumbnailURL = imagesList[0].GetValue().GetProperty("src").GetStr();
-
             // productVariant
             JsVal productVariant = line.GetProperty("productVariant");
             if(productVariant === null) continue;
 
+            string title = productVariant.GetProperty("title").GetStr();
+            string ThumbnailURL = productVariant.GetProperty("img").GetStr();
+
             string amount = productVariant.GetProperty("amount").GetStr();
             string ProductVariant = productVariant.GetProperty("id").GetStr();
+           
+            if(title == "Default Title" || title.IsEmpty())
+            {
+                JsVal productImages = line.GetProperty("productImages");
+                if(productImages === null) continue;
+
+                list<JsProp> imagesList = productImages.GetPropertyList();
+                if(imagesList.Count > 0) ThumbnailURL = imagesList[0].GetValue().GetProperty("src").GetStr();
+            }
+
+            // TextPlaneの機能が足りないのでひとまず名前は常にProductNameを使用する
+            // 機能が増えたらProductNameとValiantsNameを一行ずつ表示するようにする
+            title = line.GetProperty("productTitle").GetStr();
 
             ECItemData data = new ECItemData();
             data.ECItemCode = -1;
             data.VariantId = ProductVariant;
             data.LineId = merchandiseLineId;
             data.ThumbnailURL = ThumbnailURL;
-            data.Name = productTitle;
+            data.Name = title;
             data.Price = m_CartData.CurrencySymbol + _GetSepalatePriceText(amount.ToInt()) + m_CartData.TaxIncludedText;
             data.Desctipt = "";
             data.BuyCount = quantity;
@@ -528,7 +533,7 @@ component ECModel
 
         if(currencyCode == "JPY")
         {
-            text = "(税込み)";
+            text = "(税込)";
         }
         else if(currencyCode == "USD")
         {

package/PackageResources/project~/data/Canvas/HeliScript/EC/ECViewModel.hs

@@ -40,9 +40,18 @@ component ECViewModel
     {
         m_View.CloseCartWindow();
 
-        int ECItemCode = param.ToInt();
+        Json ecJson = hsLoadJson(param);
+        if(ecJson === null) return;
 
-        if(m_Model !== null) m_Model.FetchECItemData(ECItemCode);
+        string store_id;
+        ecJson.FindValueString("store_id", store_id);
+
+        int storeID = store_id.ToInt(); 
+
+        string label;
+        ecJson.FindValueString("label", label);
+
+        if(m_Model !== null) m_Model.FetchECItemData(storeID, label);
     }
 
     public void DrawECItemWindow(ECItemData data)

package/PackageResources/project~/data/Canvas/HeliScript/MainMenu/MainMenu/MainMenuController.hs

@@ -5,7 +5,7 @@ component MainMenuController
         if(LayerName == "mainmenu_side_home" || LayerName == "mainmenu_home")
         {
             if(ButtonName == "menu_tab_avatar_off" || ButtonName == "menu_tab_event_off" || ButtonName == "menu_tab_world_off" || ButtonName == "menu_tab_community_off" || ButtonName == "menu_tab_setting_off"
-                || ButtonName == "menu_btn_mypage" || ButtonName == "common_btn_close" || ButtonName == "popup_background")
+                || ButtonName == "menu_btn_mypage" || ButtonName == "common_btn_close" || ButtonName == "popup_background" || ButtonName == "menu_btn_myroom")
             {
                 // ProfileMenu
                 if(ButtonName == "menu_btn_mypage")
@@ -16,6 +16,16 @@ component MainMenuController
                         layer.CallComponentMethod("ProfileMenuViewModel", "OpenProfile", "");
                     }
                 }
+                else if(ButtonName == "menu_btn_myroom")
+                {
+                    LayerBundle layer = hsLayerGet("config_profile");
+                    if(layer !== null)
+                    {
+                        layer.CallComponentMethod("ProfileMenuViewModel", "OpenMyHome", "");
+                    }
+
+                    return;
+                }
                 else
                 {
                     LayerBundle layer = hsLayerGet("config_profile");

package/PackageResources/project~/data/Canvas/HeliScript/MainMenu/ProfileMenu/ProfileMenuViewModel.hs

@@ -11,8 +11,11 @@ component ProfileMenuViewModel
         m_Model = system.Layer_GetComponentByName<ProfileMenuModel>("config_profile");
 
         m_IsOpenedProfile = false;
+    }
 
-        hel_onresize_generic_add(_ResizeCallback);
+    public void OnResize()
+    {
+        m_ProfileView.ResizeCallback();
     }
 
     public void OnWindowActivate(bool IsActivate)
@@ -23,11 +26,6 @@ component ProfileMenuViewModel
         }
     }
 
-    void _ResizeCallback()
-    {
-        m_ProfileView.ResizeCallback();
-    }
-
     public void DrawProfileNameplateIcon()
     {
         m_ProfileView.DrawProfileNameplateIcon(m_Model.GetNamePlateIconURL());
@@ -80,6 +78,18 @@ component ProfileMenuViewModel
         m_IsOpenedProfile = true;
         m_Model.FetchProfile(false, false);
     }
+
+    public void OpenMyHome()
+    {
+        Player SelfPlayer = hsPlayerGet();
+        string SelfUserCode = SelfPlayer.GetCustomState("UserCode");
+        string SelfUserType = SelfPlayer.GetCustomState("UserType");
+
+        if(SelfUserType == "login" && !SelfUserCode.IsEmpty())
+        {
+            api.profiles.openMyVketUrl("/myroom/maker/?worldid=MyRoom-%s" % SelfUserCode);
+        }
+    }
     
     public void CloseProfile(string param)
     {

package/PackageResources/project~/data/Canvas/HeliScript/MainMenu/WorldMenu/WorldMenuViewModel.hs

@@ -7,11 +7,9 @@ component WorldMenuViewModel
     {
         m_Model = system.Layer_GetComponentByName<WorldMenuModel>("mainmenu_world_tab");
         m_View = new WorldMenuView();
-
-        hel_onresize_generic_add(_ResizeCallback);
     }
 
-    void _ResizeCallback()
+    public void OnResize()
     {
         m_View.ResizeCallback();
     }

package/PackageResources/project~/data/Canvas/HeliScript/MyAvatar/MyAvatarController.hs

@@ -2,8 +2,6 @@ component MyAvatarController
 {
     public void OnClickedButton(string LayerName, string ButtonName)
     {
-        int CloneArrayNumber = hsGetCloneArrayNumber();
-
         if(LayerName == "mainmenu_mypage_avatar_base")
         {
             LayerBundle layer = hsLayerGet("mainmenu_mypage_avatar_base");
@@ -25,6 +23,14 @@ component MyAvatarController
             {
                 layer.CallComponentMethod("MyAvatarViewModel", "ConfirmAvatarSelect", "");
             }
+            else if(ButtonName == "page_back")
+            {
+                layer.CallComponentMethod("MyAvatarViewModel", "ClickPageBack", "");
+            }
+            else if(ButtonName == "page_next")
+            {
+                layer.CallComponentMethod("MyAvatarViewModel", "ClickPageNext", "");
+            }
         }
         else if(LayerName == "config_myavatar_account")
         {
@@ -40,46 +46,16 @@ component MyAvatarController
                 layer.CallComponentMethod("MyAvatarViewModel", "ClickSignup", "");
             }
         }
-        else if(LayerName == "config_myavatar_List[%d]" % CloneArrayNumber)
+        else if(LayerName == "config_myavatar_List")
         {
             LayerBundle layer = hsLayerGet("mainmenu_mypage_avatar_base");
             if(layer === null) return;
 
-            if(ButtonName == "MyAvatarButton0[%d]" % CloneArrayNumber)
-            {
-                layer.CallComponentMethod("MyAvatarViewModel", "ClickGridListRow0", "%d" % CloneArrayNumber);
-            }
-            else if(ButtonName == "MyAvatarButton1[%d]" % CloneArrayNumber)
-            {
-                layer.CallComponentMethod("MyAvatarViewModel", "ClickGridListRow1", "%d" % CloneArrayNumber);
-            }
-            else if(ButtonName == "MyAvatarButton2[%d]" % CloneArrayNumber)
-            {
-                layer.CallComponentMethod("MyAvatarViewModel", "ClickGridListRow2", "%d" % CloneArrayNumber);
-            }
-            else if(ButtonName == "MyAvatarButton3[%d]" % CloneArrayNumber)
+            if(ButtonName.IndexOf("MyAvatarButton") != -1)
             {
-                layer.CallComponentMethod("MyAvatarViewModel", "ClickGridListRow3", "%d" % CloneArrayNumber);
-            }
-            else if(ButtonName == "MyAvatarButton4[%d]" % CloneArrayNumber)
-            {
-                layer.CallComponentMethod("MyAvatarViewModel", "ClickGridListRow4", "%d" % CloneArrayNumber);
-            }
-            else if(ButtonName == "MyAvatarButton0_po[%d]" % CloneArrayNumber)
-            {
-                layer.CallComponentMethod("MyAvatarViewModel", "ClickGridListRow_po0", "%d" % CloneArrayNumber);
-            }
-            else if(ButtonName == "MyAvatarButton1_po[%d]" % CloneArrayNumber)
-            {
-                layer.CallComponentMethod("MyAvatarViewModel", "ClickGridListRow_po1", "%d" % CloneArrayNumber);
-            }
-            else if(ButtonName == "MyAvatarButton2_po[%d]" % CloneArrayNumber)
-            {
-                layer.CallComponentMethod("MyAvatarViewModel", "ClickGridListRow_po2", "%d" % CloneArrayNumber);
-            }
-            else if(ButtonName == "MyAvatarButton3_po[%d]" % CloneArrayNumber)
-            {
-                layer.CallComponentMethod("MyAvatarViewModel", "ClickGridListRow_po3", "%d" % CloneArrayNumber);
+                string Index = ButtonName.SubString(("MyAvatarButton").Length(), 2);
+
+                layer.CallComponentMethod("MyAvatarViewModel", "ClickGridListRow", Index);
             }
         }
     }