Merge pull request #5 from FireDragonGameStudio/feature_update_implementNewFeatures

Feature update implement new features

Author: FireDragonGameStudio

.vsconfig

@@ -0,0 +1,6 @@
+{
+  "version": "1.0",
+  "components": [
+    "Microsoft.VisualStudio.Workload.ManagedGame"
+  ]
+}

Assets/FmvMaker/Prefabs/ClickableButtonPrefab.prefab

@@ -13,6 +13,7 @@ GameObject:
   - component: {fileID: -7522525910291765187}
   - component: {fileID: 114130167375815458}
   - component: {fileID: 8113544998094880139}
+  - component: {fileID: 3000159632771378118}
   m_Layer: 5
   m_Name: ClickableButtonPrefab
   m_TagString: Untagged
@@ -31,7 +32,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224577986564722848}
+  - {fileID: 424010470739667056}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -92,6 +93,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Navigation:
     m_Mode: 3
+    m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -136,34 +138,48 @@ MonoBehaviour:
   OnItemClicked:
     m_PersistentCalls:
       m_Calls: []
+  isButtonTransparent: 1
   itemButton: {fileID: 114130167375815458}
   itemImage: {fileID: -7522525910291765187}
-  itemText: {fileID: 114895649485565322}
---- !u!1 &1908083578406928
+  itemText: {fileID: 1326586547044006202}
+--- !u!114 &3000159632771378118
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1133256870980526}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbab530ca9b3b44e9dc0324ff4a176b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  cursorTexture: {fileID: 2800000, guid: 22b271fe5166748479b5a055e7506c0f, type: 3}
+--- !u!1 &4423966304275013577
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 224577986564722848}
-  - component: {fileID: 222866398658426926}
-  - component: {fileID: 114895649485565322}
+  - component: {fileID: 424010470739667056}
+  - component: {fileID: 4946216760572793082}
+  - component: {fileID: 1326586547044006202}
   m_Layer: 5
-  m_Name: Text
+  m_Name: Text (TMP)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &224577986564722848
+--- !u!224 &424010470739667056
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1908083578406928}
+  m_GameObject: {fileID: 4423966304275013577}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -176,45 +192,102 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &222866398658426926
+--- !u!222 &4946216760572793082
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1908083578406928}
-  m_CullTransparentMesh: 0
---- !u!114 &114895649485565322
+  m_GameObject: {fileID: 4423966304275013577}
+  m_CullTransparentMesh: 1
+--- !u!114 &1326586547044006202
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1908083578406928}
+  m_GameObject: {fileID: 4423966304275013577}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 24
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 0
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: Button
+  m_text: 'Button
+
+'
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4278190080
+  m_fontColor: {r: 0, g: 0, b: 0, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 36
+  m_fontSizeBase: 36
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}

Assets/FmvMaker/Scenes/CircleFmv.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
+  m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -188,8 +188,8 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_Father: {fileID: 1611264351}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &383087581
 GameObject:
@@ -529,7 +529,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1370328300
 MonoBehaviour:
@@ -970,6 +970,7 @@ Transform:
   - {fileID: 1563772659}
   - {fileID: 1005435512}
   - {fileID: 600364141}
+  - {fileID: 352578382}
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1052,6 +1053,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
 --- !u!223 &1648255340
 Canvas:
   m_ObjectHideFlags: 0
@@ -1069,7 +1071,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 0
+  m_AdditionalShaderChannelsFlag: 25
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0

Assets/FmvMaker/Scenes/DialogFmv.unity

@@ -188,8 +188,8 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_Father: {fileID: 1611264351}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &383087581
 GameObject:
@@ -529,7 +529,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1370328300
 MonoBehaviour:
@@ -970,6 +970,7 @@ Transform:
   - {fileID: 1563772659}
   - {fileID: 1005435512}
   - {fileID: 600364141}
+  - {fileID: 352578382}
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/FmvMaker/Scripts/Core/Facades/FmvClickableFacade.cs

@@ -1,37 +1,45 @@
 using FmvMaker.Core.Models;
 using FmvMaker.Core.Utilities;
-using System;
-using System.Collections;
+using TMPro;
 using UnityEngine;
-using UnityEngine.Networking;
 using UnityEngine.UI;
 
 namespace FmvMaker.Core.Facades {
     public class FmvClickableFacade : MonoBehaviour {
 
         public ClickableClickEvent OnItemClicked = new ClickableClickEvent();
 
+        [SerializeField]
+        private bool isButtonTransparent = false;
         [SerializeField]
         private Button itemButton;
         [SerializeField]
         private Image itemImage;
         [SerializeField]
-        private Text itemText;
+        private TextMeshProUGUI itemText;
 
         private RectTransform rectTransform;
         private ClickableModel clickableModel;
 
         private void Awake() {
-            itemButton = GetComponent<Button>();
-            itemImage = GetComponent<Image>();
-            itemText = GetComponentInChildren<Text>();
+            if (!itemButton || !itemImage || !itemText) {
+                itemButton = GetComponent<Button>();
+                itemImage = GetComponent<Image>();
+                itemText = GetComponentInChildren<TextMeshProUGUI>();
+            }
+
             rectTransform = GetComponent<RectTransform>();
             DynamicVideoResolution.Instance.ScreenSizeChanged += OnScreenSizeChanged;
         }
 
         private void OnDestroy() {
             itemButton.onClick.RemoveAllListeners();
             OnItemClicked.RemoveAllListeners();
+            DynamicVideoResolution.Instance.ScreenSizeChanged -= OnScreenSizeChanged;
+        }
+
+        private void OnScreenSizeChanged(float width, float height) {
+            rectTransform.anchoredPosition = DynamicVideoResolution.GetRelativeScreenPosition(clickableModel.RelativeScreenPosition);
         }
 
         public void SetItemData(ClickableModel model) {
@@ -49,12 +57,21 @@ public void SetItemData(ClickableModel model) {
                 itemText.enabled = true;
             }
 
+            // set to transparent if enabled
+            if (isButtonTransparent) {
+                itemImage.color = new Color(1, 1, 1, 0);
+                itemText.color = new Color(itemText.color.r, itemText.color.g, itemText.color.b, 0);
+            }
+
             rectTransform.anchoredPosition = DynamicVideoResolution.GetRelativeScreenPosition(model.RelativeScreenPosition);
             itemButton.onClick.AddListener(() => OnItemClicked?.Invoke(model));
         }
 
-        private void OnScreenSizeChanged(float width, float height) {
-            rectTransform.anchoredPosition = DynamicVideoResolution.GetRelativeScreenPosition(clickableModel.RelativeScreenPosition);
+        public void ChangeVisibility(int alphaValue) {
+            if (isButtonTransparent) {
+                itemImage.color = new Color(1, 1, 1, alphaValue);
+                itemText.color = new Color(itemText.color.r, itemText.color.g, itemText.color.b, alphaValue);
+            }
         }
 
         //private IEnumerator LoadImageSpriteCoroutine(string spritePath) {

Assets/FmvMaker/Scripts/Core/Provider/FmvClickableObjects.cs

@@ -211,5 +211,10 @@ public ClickableModel GetNavigationItemModelByName(string navigationName) {
         public void DisableNavigationTargets() {
             allNavigationItems.ForEach(navigation => navigation.gameObject.SetActive(false));
         }
+
+        public void ToggleFindableItems(bool isVisible) {
+            int alphaValue = isVisible ? 255 : 0;
+            allFindableItems.ForEach(item => item.ChangeVisibility(alphaValue));
+        }
     }
 }