فهرست منبع

最终修改!

龙腾猫跃 4 سال پیش
والد
کامیت
c0ad552921

+ 8 - 0
Assets/AddressableAssetsData/Windows.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9809fc41bc404bd469cd965590750c99
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/Resources/Entities/EnemyHeavy.prefab

@@ -102,7 +102,7 @@ Rigidbody2D:
   m_Mass: 5
   m_LinearDrag: 0
   m_AngularDrag: 0.05
-  m_GravityScale: 0.5
+  m_GravityScale: 0.3
   m_Material: {fileID: 6200000, guid: 6a9410bb3043e384eba63a5622b25c09, type: 2}
   m_Interpolate: 0
   m_SleepingMode: 1

+ 1 - 1
Assets/Resources/Entities/EnemyMover.prefab

@@ -102,7 +102,7 @@ Rigidbody2D:
   m_Mass: 1
   m_LinearDrag: 0
   m_AngularDrag: 0.05
-  m_GravityScale: 0.5
+  m_GravityScale: 0.3
   m_Material: {fileID: 6200000, guid: 6a9410bb3043e384eba63a5622b25c09, type: 2}
   m_Interpolate: 0
   m_SleepingMode: 1

+ 1 - 1
Assets/Resources/Entities/EnemyShooterBullet.prefab

@@ -102,7 +102,7 @@ Rigidbody2D:
   m_Mass: 1
   m_LinearDrag: 0
   m_AngularDrag: 0.05
-  m_GravityScale: 0.1
+  m_GravityScale: 0.13
   m_Material: {fileID: 0}
   m_Interpolate: 0
   m_SleepingMode: 1

+ 2 - 2
Assets/Resources/Entities/EntityBase.cs

@@ -60,8 +60,8 @@ public abstract class EntityBase : MonoBehaviour {
                 coll.offset = new Vector2(0, 0.3f);
             } else {
                 sprite.sprite = spriteNormal;
-                coll.size = new Vector2(coll.size.x, 1.2f);
-                coll.offset = new Vector2(0, 0.7f);
+                coll.size = new Vector2(coll.size.x, 1.6f);
+                coll.offset = new Vector2(0, 0.9f);
             }
         }
         // ÉèÖÃ

+ 1 - 1
Assets/Resources/System/Spawner.cs

@@ -13,7 +13,7 @@ public class Spawner : MonoBehaviour {
         obj.GetComponent<EnemyBase>().movingLeft = transform.localScale.x < 0;
         switch (type) {
             case EnemyType.Arrow:
-                obj.transform.position += Mathf.RoundToInt((float) Modules.randomDefault.NextDouble() - 0.15f) * Vector3.down;
+                obj.transform.position += Mathf.RoundToInt((float) Modules.randomDefault.NextDouble() - 0.15f) * Vector3.down * 1.2f;
                 break;
             case EnemyType.Shooter:
                 obj.transform.localScale = Vector3.one;

+ 13 - 9
Assets/Resources/System/StoryM.cs

@@ -129,11 +129,13 @@ public class StoryM : MonoBehaviour {
         StopCoroutine("HideStoryText");
         yield return new WaitForSeconds(1.5f);
         if (!noDifficulty) {
-            _ = Modules.randomDefault.Next(0, 4) switch {
+            _ = Modules.randomDefault.Next(0, 6) switch {
                 0 => SetStoryText("完了,寄咯!", "Woops, you died!"),
                 1 => SetStoryText("哦吼,下辈子加油吧", "Ouch, work harder next life!"),
                 2 => SetStoryText("诶,怎么回事?", "Yo, what's happening?"),
                 3 => SetStoryText("还好我没开极限模式……", "Luckily I didn't have hardcore mode on..."),
+                4 => SetStoryText("那叫啥来着……保持你的决心!", ""), //TODO: t
+                5 => SetStoryText("嗨呀,再多试试吧,能过的啦", ""),
                 _ => throw new System.NotImplementedException(),
             };
         } else {
@@ -193,7 +195,8 @@ public class StoryM : MonoBehaviour {
     }
     IEnumerator Stage3() {
         arrowMax = 3; noDifficulty = false;
-        Spawn(Spawner.EnemyType.Mover, 1);
+        Spawn(Spawner.EnemyType.Mover, 3);
+        yield return new WaitForSeconds(5f);
         yield return StartCoroutine(WaitForStoryText("说实话啊,我感觉这个游戏有点……敷衍", "To be honest, I think this game is kind of boring...")); //TODO: t 文案改了
         Spawn(Spawner.EnemyType.Mover, 1);
         yield return StartCoroutine(WaitForStoryText("我看了看,这游戏往后的新内容就只剩一种换皮怪了!", "Let's see... We only have one more skin to replace our monsters!"));
@@ -246,7 +249,7 @@ public class StoryM : MonoBehaviour {
         yield return StartCoroutine(WaitForStoryText("是不是还想马上再来一颗?", "Want to have another dice now?"));
         Spawn(Spawner.EnemyType.Mover, 2);
         yield return StartCoroutine(WaitForStoryText("但如果给你太多骰子,那岂不是显得它很……普通", "But if I give you too many dices, it will look... ordinary."));
-        arrowMax = 1;
+        arrowMax = 3;
         Spawn(Spawner.EnemyType.Shooter, 1);
         yield return StartCoroutine(WaitForStoryText("不如让我们先等等,我先给你看看之前说的新敌人", "Why don't we wait while I show you the new enemy we were talking about...?"));
         SetStoryText("额……就是换皮的那个", "Ugh... That monster with new skin!");
@@ -309,12 +312,12 @@ public class StoryM : MonoBehaviour {
         Spawn(Spawner.EnemyType.Heavy, deathInStage <= 0 ? 2 : 1);
         yield return new WaitForSeconds(1f);
         yield return StartCoroutine(WaitForStoryText("哈?", ""));
-        arrowMax = 3;
+        arrowMax = 4;
         Spawn(Spawner.EnemyType.Heavy, 1);
         yield return StartCoroutine(WaitForStoryText("螺母怎么在这个时候出来了?", ""));
         Spawn(Spawner.EnemyType.Shooter, deathInStage <= 1 ? 2 : 1);
         yield return StartCoroutine(WaitForStoryText("额……它就是我之前说的那个换皮怪", ""));
-        Spawn(Spawner.EnemyType.Heavy, 2);
+        Spawn(Spawner.EnemyType.Heavy, deathInStage <= 1 ? 2 : 1);
         yield return StartCoroutine(WaitForStoryText("但它就是最后一种敌人了!", ""));
         SetStoryText("这下就没有任何新东西了!", "");
         yield return StartCoroutine(WaitUntilClear(1, 10f, "今天真是诸事不宜……", ""));
@@ -362,13 +365,14 @@ public class StoryM : MonoBehaviour {
         stageCompleted = true;
     }
     IEnumerator Stage16() {
-        arrowMax = Mathf.Max(4, 9 - deathInStage); arrowTime = 2f; noDifficulty = false;
+        arrowMax = Mathf.Max(3, 5 - deathInStage); arrowTime = 1.5f + deathInStage * 0.1f; noDifficulty = false;
         yield return StartCoroutine(WaitForStoryText("诶?", ""));
         yield return StartCoroutine(WaitForStoryText("我们似乎到 BOSS 关卡了", ""));
         Spawn(Spawner.EnemyType.Shooter, 1);
-        yield return StartCoroutine(WaitForStoryText("似乎……就是一堆垫圈满天飞?倒也符合这游戏的尿性", ""));
         yield return new WaitForSeconds(3f);
+        yield return StartCoroutine(WaitForStoryText("似乎……就是一堆垫圈满天飞?倒也符合这游戏的尿性", ""));
         Spawn(Spawner.EnemyType.Mover, 2);
+        yield return new WaitForSeconds(3f);
         yield return StartCoroutine(WaitForStoryText("打完 BOSS 关后,就进入无尽模式了", ""));
         Spawn(Spawner.EnemyType.Shooter, 1);
         yield return StartCoroutine(WaitForStoryText("嗯……就是敌人会出现得越来越快啊,有个计时器啊,巴拉巴拉", ""));
@@ -395,9 +399,9 @@ public class StoryM : MonoBehaviour {
         arrowMax = 0; noDifficulty = true;
         yield return new WaitForSeconds(11f);
         yield return StartCoroutine(WaitForStoryText("呃……", ""));
-        yield return new WaitForSeconds(3f);
+        yield return new WaitForSeconds(5f);
         yield return StartCoroutine(WaitForStoryText("这可……不太妙……", ""));
-        yield return StartCoroutine(WaitForStoryText("后面还有无尽模式啊!无尽模式!", ""));
+        yield return StartCoroutine(WaitForStoryText("后面还有无尽模式啊!无尽模式!这样可怎么玩?", ""));
         yield return StartCoroutine(WaitForStoryText("这可咋整啊?", ""));
         yield return new WaitForSeconds(2f);
         SetStoryText("不行!我再想想办法,如果再重新丢一次骰子™,指不定就好了呢?丢一次不行就两次,对吧?", "");

+ 9 - 9
Assets/Scenes/SceneMain.unity

@@ -512,7 +512,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 247552253}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -19, y: -5, z: 0}
+  m_LocalPosition: {x: -19, y: -4.8, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1713,7 +1713,7 @@ BoxCollider2D:
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0.7}
+  m_Offset: {x: 0, y: 0.9}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0}
@@ -1724,7 +1724,7 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 0.35, y: 1.2}
+  m_Size: {x: 0.3, y: 1.6}
   m_EdgeRadius: 0.1
 --- !u!1 &558216833
 GameObject:
@@ -3805,7 +3805,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 899684095}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -19, y: 3, z: 0}
+  m_LocalPosition: {x: -19, y: 3.2, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -4230,7 +4230,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1039505543}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 19, y: -5, z: 0}
+  m_LocalPosition: {x: 19, y: -4.8, z: 0}
   m_LocalScale: {x: -1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -5555,7 +5555,7 @@ AudioSource:
   OutputAudioMixerGroup: {fileID: 0}
   m_audioClip: {fileID: 8300000, guid: fad5f40108e03ec4dbe42eb884f842c1, type: 3}
   m_PlayOnAwake: 1
-  m_Volume: 0.3
+  m_Volume: 0.2
   m_Pitch: 1
   Loop: 1
   Mute: 0
@@ -7581,7 +7581,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1506709098}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 19, y: 3, z: 0}
+  m_LocalPosition: {x: 19, y: 3.2, z: 0}
   m_LocalScale: {x: -1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -11538,7 +11538,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2086650780}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 19, y: -1, z: 0}
+  m_LocalPosition: {x: 19, y: -0.8, z: 0}
   m_LocalScale: {x: -1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -11820,7 +11820,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5530122219004759415}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -19, y: -1, z: 0}
+  m_LocalPosition: {x: -19, y: -0.8, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

+ 0 - 106
Assets/Scenes/SceneMenu.unity

@@ -537,8 +537,6 @@ GameObject:
   m_Component:
   - component: {fileID: 1482928102}
   - component: {fileID: 1482928101}
-  - component: {fileID: 1482928100}
-  - component: {fileID: 1482928103}
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -546,14 +544,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!81 &1482928100
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1482928099}
-  m_Enabled: 1
 --- !u!20 &1482928101
 Camera:
   m_ObjectHideFlags: 0
@@ -612,102 +602,6 @@ Transform:
   m_Father: {fileID: 1836840626}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!82 &1482928103
-AudioSource:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1482928099}
-  m_Enabled: 1
-  serializedVersion: 4
-  OutputAudioMixerGroup: {fileID: 0}
-  m_audioClip: {fileID: 8300000, guid: 63867e8d3dd8fbc4bb0bd31a4fbdfcf1, type: 3}
-  m_PlayOnAwake: 1
-  m_Volume: 1
-  m_Pitch: 1
-  Loop: 1
-  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 &1754331884
 GameObject:
   m_ObjectHideFlags: 0

+ 3 - 0
ProjectSettings/EditorBuildSettings.asset

@@ -5,6 +5,9 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
+  - enabled: 1
+    path: Assets/Scenes/SceneMenu.unity
+    guid: 8c6c9c0864aeb4c8f8453aaa4103e903
   - enabled: 1
     path: Assets/Scenes/SceneMain.unity
     guid: 2cda990e2423bbf4892e6590ba056729

+ 10 - 2
ProjectSettings/ProjectSettings.asset

@@ -135,7 +135,8 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleVersion: 1.0
-  preloadedAssets: []
+  preloadedAssets:
+  - {fileID: 11400000, guid: b919f5081a3a2436486a3d3805ae50a3, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -269,7 +270,14 @@ PlayerSettings:
   AndroidMinifyDebug: 0
   AndroidValidateAppBundleSize: 1
   AndroidAppBundleSizeToValidate: 150
-  m_BuildTargetIcons: []
+  m_BuildTargetIcons:
+  - m_BuildTarget: 
+    m_Icons:
+    - serializedVersion: 2
+      m_Icon: {fileID: 2800000, guid: 19c156188586cd949b5aa6bcd9d8b6e0, type: 3}
+      m_Width: 128
+      m_Height: 128
+      m_Kind: 0
   m_BuildTargetPlatformIcons: []
   m_BuildTargetBatching: []
   m_BuildTargetGraphicsJobs: