Răsfoiți Sursa

音频与字幕

龙腾猫跃 4 ani în urmă
părinte
comite
6658e77221

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/SOURCEHANSANSCN-NORMAL SDF.asset


+ 0 - 0
Assets/Resources/Audio/pickup.ogg → Assets/Resources/Audio/DicePickup.ogg


+ 0 - 0
Assets/Resources/Audio/pickup.ogg.meta → Assets/Resources/Audio/DicePickup.ogg.meta


+ 1 - 0
Assets/Resources/Dice/DiceEntity.cs

@@ -21,6 +21,7 @@ public class DiceEntity : MonoBehaviour {
     public bool canRestore = true;
     public bool canRestore = true;
     private void OnCollisionEnter2D(Collision2D collision) {
     private void OnCollisionEnter2D(Collision2D collision) {
         if (!collision.gameObject.CompareTag("Player")) return;
         if (!collision.gameObject.CompareTag("Player")) return;
+        AudioM.Play("DicePickup");
         // ¹Ø±ÕÆäËûÒÆ¶¯
         // ¹Ø±ÕÆäËûÒÆ¶¯
         GetComponent<Collider2D>().enabled = false;
         GetComponent<Collider2D>().enabled = false;
         GetComponent<Rigidbody2D>().gravityScale = 0;
         GetComponent<Rigidbody2D>().gravityScale = 0;

+ 17 - 0
Assets/Resources/System/AudioM.cs

@@ -0,0 +1,17 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using System.Linq;
+
+public static class AudioM {
+
+    private static Dictionary<string, AudioClip> audios = null;
+    public static void Play(string name, float volume = 1f) {
+        if (audios == null) {
+            audios = new();
+            Resources.FindObjectsOfTypeAll<AudioClip>().ToList().ForEach(a => audios.Add(a.name, a));
+        }
+        AudioSource.PlayClipAtPoint(audios[name], Camera.allCameras[0].transform.position, volume);
+    }
+
+}

+ 11 - 0
Assets/Resources/System/AudioM.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9d9bd502a18108c4faace5119884accb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 5
Assets/Resources/System/StoryM.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Generic;
+using DG.Tweening;
 using UnityEngine;
 using UnityEngine;
 using UnityEngine.Localization.Settings;
 using UnityEngine.Localization.Settings;
 using UnityEngine.UI;
 using UnityEngine.UI;
@@ -8,19 +9,19 @@ public class StoryM : MonoBehaviour {
 
 
     
     
     public TMPro.TextMeshProUGUI textStory;
     public TMPro.TextMeshProUGUI textStory;
-    public RectTransform panStory;
+    public RectTransform shapeBack;
     void Start() {
     void Start() {
         StartCoroutine(test());
         StartCoroutine(test());
     }
     }
     IEnumerator SetStoryText(string textCh, string textEn = "English", float hideTime = 2f) {
     IEnumerator SetStoryText(string textCh, string textEn = "English", float hideTime = 2f) {
         textStory.text = LocalizationSettings.SelectedLocale.LocaleName == "Chinese (Simplified) (zh-CN)" ? textCh : textEn;
         textStory.text = LocalizationSettings.SelectedLocale.LocaleName == "Chinese (Simplified) (zh-CN)" ? textCh : textEn;
-        panStory.gameObject.SetActive(true);
-        //LayoutRebuilder.ForceRebuildLayoutImmediate(panStory);
-        //panStory.GetComponent<ContentSizeMininum>().Update();
+        LayoutRebuilder.ForceRebuildLayoutImmediate(textStory.rectTransform);
+        shapeBack.DOScaleX((textStory.rectTransform.rect.width + 40f) / 100f, 0.06f);
         yield return new WaitForSeconds(hideTime);
         yield return new WaitForSeconds(hideTime);
     }
     }
     public void HideStoryText() {
     public void HideStoryText() {
-        panStory.gameObject.SetActive(false);
+        textStory.text = "";
+        shapeBack.DOScaleX(0, 0.06f);
     }
     }
 
 
     IEnumerator test() {
     IEnumerator test() {

+ 140 - 115
Assets/Scenes/SceneMain.unity

@@ -1223,7 +1223,7 @@ TilemapRenderer:
   m_SortingLayer: 0
   m_SortingLayer: 0
   m_SortingOrder: -1
   m_SortingOrder: -1
   m_ChunkSize: {x: 32, y: 32, z: 32}
   m_ChunkSize: {x: 32, y: 32, z: 32}
-  m_ChunkCullingBounds: {x: 1, y: 1, z: 0}
+  m_ChunkCullingBounds: {x: 0.21111113, y: 0.21111113, z: 0}
   m_MaxChunkCount: 16
   m_MaxChunkCount: 16
   m_MaxFrameAge: 16
   m_MaxFrameAge: 16
   m_SortOrder: 0
   m_SortOrder: 0
@@ -3398,7 +3398,6 @@ GameObject:
   m_Component:
   m_Component:
   - component: {fileID: 941795212}
   - component: {fileID: 941795212}
   - component: {fileID: 941795214}
   - component: {fileID: 941795214}
-  - component: {fileID: 941795215}
   m_Layer: 5
   m_Layer: 5
   m_Name: PanStory
   m_Name: PanStory
   m_TagString: Untagged
   m_TagString: Untagged
@@ -3419,14 +3418,14 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children:
   m_Children:
   - {fileID: 2088920593}
   - {fileID: 2088920593}
-  - {fileID: 1645681420}
+  - {fileID: 1797852845}
   m_Father: {fileID: 757919350}
   m_Father: {fileID: 757919350}
   m_RootOrder: 1
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0, y: 70}
   m_AnchoredPosition: {x: 0, y: 70}
-  m_SizeDelta: {x: 230.01, y: 30.01}
+  m_SizeDelta: {x: 50, y: 0}
   m_Pivot: {x: 0.5, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &941795214
 --- !u!222 &941795214
 CanvasRenderer:
 CanvasRenderer:
@@ -3436,19 +3435,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 941795211}
   m_GameObject: {fileID: 941795211}
   m_CullTransparentMesh: 1
   m_CullTransparentMesh: 1
---- !u!114 &941795215
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 941795211}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: bff74aacfc1dee649b050f5a82f535bc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  target: {fileID: 1645681420}
 --- !u!1 &1027790315
 --- !u!1 &1027790315
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -4151,6 +4137,7 @@ GameObject:
   - component: {fileID: 1378097947}
   - component: {fileID: 1378097947}
   - component: {fileID: 1378097946}
   - component: {fileID: 1378097946}
   - component: {fileID: 1378097949}
   - component: {fileID: 1378097949}
+  - component: {fileID: 1378097950}
   m_Layer: 0
   m_Layer: 0
   m_Name: Managers
   m_Name: Managers
   m_TagString: Untagged
   m_TagString: Untagged
@@ -4242,6 +4229,20 @@ MonoBehaviour:
   - {fileID: 1688445079}
   - {fileID: 1688445079}
   - {fileID: 1153718130}
   - {fileID: 1153718130}
   - {fileID: 803082884}
   - {fileID: 803082884}
+--- !u!114 &1378097950
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1378097945}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 93ba20d9628953a449e4b5f0e732060b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textStory: {fileID: 1797852847}
+  shapeBack: {fileID: 2088920593}
 --- !u!1 &1415309056
 --- !u!1 &1415309056
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -6020,94 +6021,6 @@ Transform:
   m_Father: {fileID: 0}
   m_Father: {fileID: 0}
   m_RootOrder: 4
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1645681419
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1645681420}
-  - component: {fileID: 1645681423}
-  - component: {fileID: 1645681422}
-  - component: {fileID: 1645681421}
-  m_Layer: 5
-  m_Name: PanStoryText
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1645681420
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1645681419}
-  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}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1797852845}
-  m_Father: {fileID: 941795212}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 55}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1645681421
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1645681419}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 0
---- !u!114 &1645681422
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1645681419}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 25
-    m_Right: 25
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 0
-  m_Spacing: 0
-  m_ChildForceExpandWidth: 0
-  m_ChildForceExpandHeight: 1
-  m_ChildControlWidth: 1
-  m_ChildControlHeight: 1
-  m_ChildScaleWidth: 1
-  m_ChildScaleHeight: 1
-  m_ReverseArrangement: 0
---- !u!222 &1645681423
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1645681419}
-  m_CullTransparentMesh: 1
 --- !u!1 &1688445079
 --- !u!1 &1688445079
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -6289,6 +6202,7 @@ GameObject:
   - component: {fileID: 1797852845}
   - component: {fileID: 1797852845}
   - component: {fileID: 1797852848}
   - component: {fileID: 1797852848}
   - component: {fileID: 1797852847}
   - component: {fileID: 1797852847}
+  - component: {fileID: 1797852849}
   m_Layer: 5
   m_Layer: 5
   m_Name: TextStory
   m_Name: TextStory
   m_TagString: Untagged
   m_TagString: Untagged
@@ -6308,13 +6222,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Children: []
-  m_Father: {fileID: 1645681420}
-  m_RootOrder: 0
+  m_Father: {fileID: 941795212}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1797852847
 --- !u!114 &1797852847
 MonoBehaviour:
 MonoBehaviour:
@@ -6336,7 +6250,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
   m_OnCullStateChanged:
     m_PersistentCalls:
     m_PersistentCalls:
       m_Calls: []
       m_Calls: []
-  m_text: "\u8FD9\u662F\u4E00\u4E9B\u65C1\u767D"
+  m_text: 
   m_isRightToLeft: 0
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 283cec36496b84640a3220e6d4736677, type: 2}
   m_fontAsset: {fileID: 11400000, guid: 283cec36496b84640a3220e6d4736677, type: 2}
   m_sharedMaterial: {fileID: -4366241451420931623, guid: 283cec36496b84640a3220e6d4736677, type: 2}
   m_sharedMaterial: {fileID: -4366241451420931623, guid: 283cec36496b84640a3220e6d4736677, type: 2}
@@ -6413,6 +6327,20 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1797852844}
   m_GameObject: {fileID: 1797852844}
   m_CullTransparentMesh: 1
   m_CullTransparentMesh: 1
+--- !u!114 &1797852849
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1797852844}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &1853588250
 --- !u!1 &1853588250
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -6693,6 +6621,7 @@ GameObject:
   - component: {fileID: 1926663705}
   - component: {fileID: 1926663705}
   - component: {fileID: 1926663701}
   - component: {fileID: 1926663701}
   - component: {fileID: 1926663706}
   - component: {fileID: 1926663706}
+  - component: {fileID: 1926663707}
   m_Layer: 0
   m_Layer: 0
   m_Name: Camera
   m_Name: Camera
   m_TagString: Untagged
   m_TagString: Untagged
@@ -6766,6 +6695,102 @@ AudioListener:
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1926663700}
   m_GameObject: {fileID: 1926663700}
   m_Enabled: 1
   m_Enabled: 1
+--- !u!82 &1926663707
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1926663700}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 0}
+  m_PlayOnAwake: 1
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
 --- !u!1 &2088920592
 --- !u!1 &2088920592
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -6793,16 +6818,16 @@ RectTransform:
   m_GameObject: {fileID: 2088920592}
   m_GameObject: {fileID: 2088920592}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Children: []
   m_Father: {fileID: 941795212}
   m_Father: {fileID: 941795212}
   m_RootOrder: 0
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 50}
+  m_SizeDelta: {x: 100, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2088920594
 --- !u!114 &2088920594
 MonoBehaviour:
 MonoBehaviour:

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff