x89rt2 3 달 전
부모
커밋
40834946be

+ 103 - 0
Assets/Scenes/Opening.unity

@@ -64666,6 +64666,7 @@ GameObject:
   - component: {fileID: 1576401445}
   - component: {fileID: 1576401446}
   - component: {fileID: 1576401447}
+  - component: {fileID: 1576401448}
   m_Layer: 5
   m_Name: DeckInfoPanel
   m_TagString: Untagged
@@ -64737,6 +64738,27 @@ MonoBehaviour:
   DeckCountText: {fileID: 1988002286}
   TrialDrawButton: {fileID: 5506376018178374681}
   isFromSelectDeck: 0
+--- !u!95 &1576401448
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1576401444}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 89b572d6698ea714097bf5420918e98c, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &1582264489
 GameObject:
   m_ObjectHideFlags: 0
@@ -72852,6 +72874,7 @@ GameObject:
   - component: {fileID: 1792775834}
   - component: {fileID: 1792775836}
   - component: {fileID: 1792775835}
+  - component: {fileID: 1792775837}
   m_Layer: 5
   m_Name: DeckInfoPanel
   m_TagString: Untagged
@@ -72923,6 +72946,27 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1792775833}
   m_CullTransparentMesh: 0
+--- !u!95 &1792775837
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1792775833}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 0}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &1795074585
 GameObject:
   m_ObjectHideFlags: 0
@@ -89882,6 +89926,7 @@ GameObject:
   - component: {fileID: 2123878073}
   - component: {fileID: 2123878075}
   - component: {fileID: 2123878074}
+  - component: {fileID: 2123878076}
   m_Layer: 5
   m_Name: DeckInfoPanel
   m_TagString: Untagged
@@ -89953,6 +89998,27 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2123878072}
   m_CullTransparentMesh: 0
+--- !u!95 &2123878076
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2123878072}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 0}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &2125303686
 GameObject:
   m_ObjectHideFlags: 0
@@ -105731,6 +105797,7 @@ GameObject:
   - component: {fileID: 7827412352382397946}
   - component: {fileID: 7827412352382397944}
   - component: {fileID: 7827412352382397945}
+  - component: {fileID: 7827412352382397950}
   m_Layer: 5
   m_Name: DeckInfoPanel
   m_TagString: Untagged
@@ -105738,6 +105805,27 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!95 &7827412352382397950
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7827412352382397949}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 0}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!222 &7827412352585523691
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -106837,6 +106925,7 @@ GameObject:
   - component: {fileID: 7827412352956199575}
   - component: {fileID: 7827412352956199570}
   - component: {fileID: 7827412352956199571}
+  - component: {fileID: 7827412352956199576}
   m_Layer: 0
   m_Name: Opening
   m_TagString: Untagged
@@ -106859,6 +106948,20 @@ MonoBehaviour:
   playerInfo: {fileID: 7827412351893259071}
   loadingObject: {fileID: 1378047648}
   UpdateButtonParent: {fileID: 0}
+--- !u!114 &7827412352956199576
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7827412352956199574}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f2a696ce2a233204c9fc6c9d84bf9750, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  URL: 
+  HashTacgs: []
 --- !u!222 &7827412353023664826
 CanvasRenderer:
   m_ObjectHideFlags: 0

+ 5 - 5
Assets/Scripts/Script/CardImagePanel.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+�ソusing System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using TMPro;
@@ -59,7 +59,7 @@ public class CardImagePanel : OffAnimation
         {
             _infoText.text = LocalizeUtility.GetLocalizedString(
                                 EngMessage: $"The following {lackCardImageCardEntities.Count} card images are not set.",
-                                JpnMessage: $"以下の {lackCardImageCardEntities.Count}枚の\nカード画像がセットされていません。"
+                                JpnMessage: $"莉・荳九� {lackCardImageCardEntities.Count}譫壹�\n繧ォ繝シ繝臥判蜒上′繧サ繝�ヨ縺輔l縺ヲ縺�∪縺帙s縲�"
                             );
 
             _lackCardImagesObject.SetActive(true);
@@ -71,7 +71,7 @@ public class CardImagePanel : OffAnimation
         {
             _infoText.text = LocalizeUtility.GetLocalizedString(
                                 EngMessage: "All card images are set.",
-                                JpnMessage: "カード画像は全てセットされています。"
+                                JpnMessage: "繧ォ繝シ繝臥判蜒上�蜈ィ縺ヲ繧サ繝�ヨ縺輔l縺ヲ縺�∪縺吶€�"
                             );
         }
     }
@@ -132,8 +132,8 @@ public class CardImagePanel : OffAnimation
             CommandTexts,
             LocalizeUtility.GetLocalizedString(
             EngMessage: "The list of card image names has been copied to the clipboard!",
-            JpnMessage: "カード画像名一覧を\nクリップボードにコピーしました!"
+            JpnMessage: "繧ォ繝シ繝臥判蜒丞錐荳€隕ァ繧箪n繧ッ繝ェ繝��繝懊�繝峨↓繧ウ繝斐�縺励∪縺励◆!"
         ),
             true);
     }
-}
+}

+ 3 - 6
Assets/Scripts/Script/ResizeWindow.cs

@@ -1,10 +1,7 @@
-using System.Collections;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using UnityEngine;
 using Button = UnityEngine.UI.Button;
 using Toggle = UnityEngine.UI.Toggle;
-using System;
 
 public class ResizeWindow : MonoBehaviour
 {
@@ -22,8 +19,8 @@ public class ResizeWindow : MonoBehaviour
     {
         SetButtonsInteractable();
         gameObject.SetActive(true);
-        anim.SetInteger(OpenHash, 1);
-        anim.SetInteger(CloseHash, 0);
+        anim.SafeSetInt(OpenHash, 1);
+        anim.SafeSetInt(CloseHash, 0);
 
         if (fullScreenToggle != null)
         {
@@ -121,4 +118,4 @@ public class ResizeWindow : MonoBehaviour
         //    button.interactable = !UnityEngine.Device.Screen.fullScreen;
         //}
     }
-}
+}

+ 2 - 2
Assets/Scripts/Script/SelectDeck.cs

@@ -28,8 +28,8 @@ public class SelectDeck : OffAnimation
     public void OffSelectDeck()
     {
         anim.enabled = true;
-        anim.SafeSetInt(OpenHash, 1);
-        anim.SafeSetInt(CloseHash, 0);
+        anim.SafeSetInt(OpenHash, 0);
+        anim.SafeSetInt(CloseHash, 1);
 
         isOpen = false;
     }

+ 1 - 4
Assets/Scripts/Script/ServerRegionPanel.cs

@@ -1,9 +1,6 @@
-using System;
-using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.Events;
-using UnityEngine.UI;
+
 public class ServerRegionPanel : OffAnimation
 {
     private static readonly int CloseHash = Animator.StringToHash("Close");

+ 25 - 25
Assets/Scripts/Script/TrialDraw.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
@@ -16,9 +16,9 @@ public class TrialDraw : MonoBehaviour
 
     public Text DeckCountText;
 
-    List<CEntity_Base> originalDeckCards = new List<CEntity_Base>();
-    List<CEntity_Base> deckCards = new List<CEntity_Base>();
-    List<CEntity_Base> drewCards = new List<CEntity_Base>();
+    List<CEntity_Base> _originalDeckCards = new List<CEntity_Base>();
+    List<CEntity_Base> _deckCards = new List<CEntity_Base>();
+    List<CEntity_Base> _drewCards = new List<CEntity_Base>();
 
     public Button drawButton;
 
@@ -31,14 +31,14 @@ public class TrialDraw : MonoBehaviour
 
         detailCard.OffDetailCard();
 
-        originalDeckCards = new List<CEntity_Base>();
+        _originalDeckCards = new List<CEntity_Base>();
 
         foreach (CEntity_Base cEntity_Base in cEntity_Bases)
         {
-            originalDeckCards.Add(cEntity_Base);
+            _originalDeckCards.Add(cEntity_Base);
         }
 
-        yield return ContinuousController.instance.StartCoroutine(Set(originalDeckCards));
+        yield return ContinuousController.instance.StartCoroutine(Set(_originalDeckCards));
     }
 
     IEnumerator Set(List<CEntity_Base> cEntity_Bases)
@@ -47,15 +47,15 @@ public class TrialDraw : MonoBehaviour
 
         drawButton.transform.parent.gameObject.SetActive(false);
 
-        deckCards = new List<CEntity_Base>();
-        drewCards = new List<CEntity_Base>();
+        _deckCards = new List<CEntity_Base>();
+        _drewCards = new List<CEntity_Base>();
 
         foreach (CEntity_Base cEntity_Base in cEntity_Bases)
         {
-            deckCards.Add(cEntity_Base);
+            _deckCards.Add(cEntity_Base);
         }
 
-        deckCards = RandomUtility.ShuffledDeckCards(deckCards);
+        _deckCards = RandomUtility.ShuffledDeckCards(_deckCards);
 
         //detailCard.OffDetailCard();
 
@@ -71,24 +71,24 @@ public class TrialDraw : MonoBehaviour
             DrawCard();
         }
 
-        yield return new WaitWhile(() => CardScroll.content.childCount < drewCards.Count);
+        yield return new WaitWhile(() => CardScroll.content.childCount < _drewCards.Count);
 
         this.gameObject.SetActive(true);
 
         Open();
 
-        drawButton.interactable = deckCards.Count >= 1;
+        drawButton.interactable = _deckCards.Count >= 1;
 
-        drawButton.transform.parent.gameObject.SetActive(deckCards.Count >= 1);
+        drawButton.transform.parent.gameObject.SetActive(_deckCards.Count >= 1);
     }
 
     public void DrawCard()
     {
-        if (deckCards.Count >= 1)
+        if (_deckCards.Count >= 1)
         {
-            CEntity_Base drewCard = deckCards[0];
-            deckCards.Remove(drewCard);
-            drewCards.Add(drewCard);
+            CEntity_Base drewCard = _deckCards[0];
+            _deckCards.Remove(drewCard);
+            _drewCards.Add(drewCard);
 
             CardPrefab_CreateDeck _cardPrefab_CreateDeck = null;
 
@@ -107,9 +107,9 @@ public class TrialDraw : MonoBehaviour
 
         EventSystem.current.SetSelectedGameObject(transform.GetChild(0).gameObject);
 
-        drawButton.interactable = deckCards.Count >= 1;
+        drawButton.interactable = _deckCards.Count >= 1;
 
-        drawButton.transform.parent.gameObject.SetActive(deckCards.Count >= 1);
+        drawButton.transform.parent.gameObject.SetActive(_deckCards.Count >= 1);
 
         SetDeckCountText();
     }
@@ -176,11 +176,11 @@ public class TrialDraw : MonoBehaviour
     public void SetDeckCountText()
     {
         DeckCountText.text = LocalizeUtility.GetLocalizedString(
-            EngMessage: $"Remaining Cards in Deck : {deckCards.Count}/{originalDeckCards.Count}",
-            JpnMessage: $"�f�b�LŽc‚č–‡�” : {deckCards.Count}/{originalDeckCards.Count}"
+            EngMessage: $"Remaining Cards in Deck : {_deckCards.Count}/{_originalDeckCards.Count}",
+            JpnMessage: $"??? : {_deckCards.Count}/{_originalDeckCards.Count}"
         );
 
-        if (deckCards.Count >= 1)
+        if (_deckCards.Count >= 1)
         {
             DeckCountText.color = new Color32(255, 255, 255, 255);
         }
@@ -193,7 +193,7 @@ public class TrialDraw : MonoBehaviour
 
     public void OnClickRedrawButton()
     {
-        ContinuousController.instance.StartCoroutine(Set(originalDeckCards));
+        ContinuousController.instance.StartCoroutine(Set(_originalDeckCards));
         ContinuousController.instance.PlaySE(Opening.instance.DrawSE);
     }
 
@@ -208,4 +208,4 @@ public class TrialDraw : MonoBehaviour
         ContinuousController.instance.PlaySE(Opening.instance.CancelSE);
         Close();
     }
-}
+}

+ 6 - 7
Assets/Scripts/Script/VolumePanel.cs

@@ -1,11 +1,10 @@
 using System.Collections;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
 using UnityEngine;
 using UnityEngine.UI;
 
 public class VolumePanel : MonoBehaviour
 {
+    private static WaitForSeconds _waitForSeconds0_15 = new WaitForSeconds(0.15f);
     private static readonly int CloseHash = Animator.StringToHash("Close");
     private static readonly int OpenHash = Animator.StringToHash("Open");
     [Header("SEスライダー")]
@@ -42,8 +41,8 @@ public class VolumePanel : MonoBehaviour
         });
 
         gameObject.SetActive(true);
-        anim.SetInteger("Open", 1);
-        anim.SetInteger("Close", 0);
+        anim.SafeSetInt(OpenHash, 1);
+        anim.SafeSetInt(CloseHash, 0);
     }
 
     public void Off()
@@ -100,7 +99,7 @@ public class VolumePanel : MonoBehaviour
 
     bool _notPlaySample = false;
 
-    public void PlaySampleSE(float value)
+    public void PlaySampleSE(float _)
     {
         if (Opening.instance != null)
         {
@@ -125,7 +124,7 @@ public class VolumePanel : MonoBehaviour
     {
         _notPlaySample = true;
 
-        yield return new WaitForSeconds(0.15f);
+        yield return _waitForSeconds0_15;
 
         _notPlaySample = false;
     }
@@ -137,4 +136,4 @@ public class VolumePanel : MonoBehaviour
             ContinuousController.instance.SetBGMVolume(value);
         }
     }
-}
+}