st15

Assets/Resources/Dice/DiceUI.cs

@@ -37,15 +37,16 @@ public class DiceUI : MonoBehaviour {
         if (!Input.GetMouseButtonUp(0) || !(allowPress || Input.GetKey(KeyCode.LeftControl)) || 
             !RectTransformUtility.RectangleContainsScreenPoint(rectTransform, Input.mousePosition, AspectUtility.cam)) return;
         // µã»÷
-        DropDice();
+        DropDice(true);
     }
 
     public bool isDropped = false;
-    public void DropDice() {
+    public void DropDice(bool canRestore) {
         DiceEntity diceNew = GameObject.Instantiate(InputM.instance.dicePrefab).GetComponent<DiceEntity>();
         diceNew.transform.localScale = Vector2.one * 1.11f;
         diceNew.transform.position = rectTransform.position;
         diceNew.key = keybind;
+        diceNew.canRestore = canRestore;
         isDropped = true;
         UpdateColor();
     }

Assets/Resources/Entities/EnemyHeavy.prefab

@@ -11,8 +11,8 @@ GameObject:
   - component: {fileID: 9040011293892009548}
   - component: {fileID: 9040011293892009544}
   - component: {fileID: 9040011293892009547}
-  - component: {fileID: 9040011293892009546}
   - component: {fileID: 9040011293892009549}
+  - component: {fileID: 159569391021988199}
   m_Layer: 8
   m_Name: EnemyHeavy
   m_TagString: Enemy
@@ -108,32 +108,6 @@ Rigidbody2D:
   m_SleepingMode: 1
   m_CollisionDetection: 1
   m_Constraints: 4
---- !u!61 &9040011293892009546
-BoxCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9040011293892009551}
-  m_Enabled: 1
-  m_Density: 1
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0.75}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0.5, y: 0}
-    oldSize: {x: 1.5, y: 1.5}
-    newSize: {x: 1, y: 1}
-    adaptiveTilingThreshold: 0.5
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  serializedVersion: 2
-  m_Size: {x: 1.5, y: 1.5}
-  m_EdgeRadius: 0
 --- !u!114 &9040011293892009549
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -164,3 +138,19 @@ MonoBehaviour:
   hp: 12
   knockbackForceH: 30
   knockbackForceV: 8
+--- !u!58 &159569391021988199
+CircleCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9040011293892009551}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0.6666667}
+  serializedVersion: 2
+  m_Radius: 0.6

Assets/Resources/Entities/EntityBase.cs

@@ -10,6 +10,7 @@ public abstract class EntityBase : MonoBehaviour {
     internal BoxCollider2D coll;
     public Sprite spriteNormal, spriteDown;
     void Start() {
+        baseMass *= (float) Modules.randomDefault.NextDouble() * 0.4f + 0.8f;
         rb = GetComponent<Rigidbody2D>();
         sprite = GetComponent<SpriteRenderer>();
         coll = GetComponent<BoxCollider2D>();

Assets/Resources/Entities/Player.cs

@@ -120,7 +120,7 @@ public class Player : EntityBase {
             currentShootDelay -= Time.deltaTime;
         }
         string fireKey = InputM.GetKeyRaw(InputM.KeyType.Fire);
-        bool isFireDown = fireKey == "l" ? Input.GetMouseButton(0) : (fireKey == "r" ? Input.GetMouseButton(1) : Input.GetKey(fireKey));
+        bool isFireDown = fireKey == "l" ? Input.GetMouseButtonDown(0) : (fireKey == "r" ? Input.GetMouseButtonDown(1) : Input.GetKeyDown(fireKey));
         if (isFireDown && currentBullet == 0 && currentReloadDelay <= 0f) {
             AudioM.Play("bullet_empty", 0.7f);
         }

Assets/Resources/System/InputM.cs

@@ -119,8 +119,8 @@ public class InputM : MonoBehaviour {
         return resultStr;
     }
 
-    public static void DropDice(KeyType key) {
-        GetDiceUI(key).GetComponent<DiceUI>().DropDice();
+    public static void DropDice(KeyType key, bool canRestore = false) {
+        GetDiceUI(key).GetComponent<DiceUI>().DropDice(canRestore);
     }
 
 }

Assets/Resources/System/StoryM.cs

@@ -287,14 +287,14 @@ public class StoryM : MonoBehaviour {
         stageCompleted = true;
     }
     IEnumerator Stage10() {
-        arrowMax = deathInStage <= 2 ? 0 : 2; noDifficulty = false;
+        arrowMax = deathInStage <= 2 ? 2 : 0; noDifficulty = false;
         yield return StartCoroutine(WaitForStoryText("唔，看起来特制按键骰子™的威力还挺大……", ""));
         Spawn(Spawner.EnemyType.Mover, deathInStage <= 0 ? 4 : 3);
         yield return new WaitForSeconds(1.5f);
         SetStoryText("呼，圆锯片看起来也还剩了不少", "");
         yield return StartCoroutine(WaitUntilClear(1, 10f, "哇哦……", ""));
         Spawn(Spawner.EnemyType.Shooter, deathInStage <= 1 ? 3 : 2);
-        yield return StartCoroutine(WaitForStoryText("看起来我低估了特制按键骰子™的……", ""));
+        yield return StartCoroutine(WaitForStoryText("看起来我低估了骰子™的……", ""));
         SetStoryText("刺激程度", "");
         yield return StartCoroutine(WaitUntilClear(2, 10f, "这不比原来好玩多了嘛！", ""));
         stageCompleted = true;
@@ -302,15 +302,44 @@ public class StoryM : MonoBehaviour {
     IEnumerator Stage11() {
         arrowMax = 2; noDifficulty = false;
         yield return StartCoroutine(WaitForStoryText("既然骰子™能为游戏的玩法带来颠覆性的体验", ""));
-        SetStoryText("那我们为啥不再立即多来几颗呢？", "");
-        yield return new WaitForSeconds(2f);
-        Spawn(Spawner.EnemyType.Heavy, 1);
+        SetStoryText("那我们为啥不再立即多来几颗呢？这不是摆明了越多骰子就越好玩么？", "");
+        Spawn(Spawner.EnemyType.Heavy, deathInStage <= 0 ? 2 : 1);
         yield return new WaitForSeconds(1f);
-        yield return StartCoroutine(WaitForStoryText("什么？", ""));
+        yield return StartCoroutine(WaitForStoryText("哈？", ""));
+        arrowMax = 3;
+        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, 1);
-        yield return StartCoroutine(WaitForStoryText("那是我之前说的最后一种换皮怪！", ""));
-        yield return StartCoroutine(WaitForStoryText("它怎么在这个时候漏下来了？", ""));
-        Spawn(Spawner.EnemyType.Heavy, 2);
+        yield return StartCoroutine(WaitForStoryText("但它就是最后一种敌人了！", ""));
+        SetStoryText("这下就没有任何新东西了！", "");
+        yield return StartCoroutine(WaitUntilClear(1, 10f, "今天真是诸事不宜……", ""));
+        stageCompleted = true;
+    }
+    IEnumerator Stage12() {
+        arrowMax = 0; noDifficulty = true;
+        Spawn(Spawner.EnemyType.Shooter, 1);
+        yield return StartCoroutine(WaitForStoryText("没有新东西就没有悬念，那玩家就会直接 Alt+F4 走人了", ""));
+        yield return StartCoroutine(WaitForStoryText("不行……", ""));
+        SetStoryText("我们需要更多的特制按键骰子™！", "");
+        yield return new WaitForSeconds(1.5f);
+        InputM.DropDice(new List<InputM.KeyType>() { InputM.KeyType.Jump, InputM.KeyType.Reload }.RandomOne());
+        stageCompleted = true;
+    }
+    IEnumerator Stage13() {
+        arrowMax = 0; noDifficulty = true;
+        yield return StartCoroutine(WaitUntilPickDice(10f, "拜托，我就只剩下骰子™了，你不捡还能干什么？", ""));
+        stageCompleted = true;
+    }
+    IEnumerator Stage14() {
+        arrowMax = 0; noDifficulty = true;
+        yield return new WaitForSeconds(7f);
+        stageCompleted = true;
+    }
+    IEnumerator Stage15() {
+        arrowMax = 2; noDifficulty = false;
+        yield return StartCoroutine(WaitForStoryText("好嘞", ""));
     }
 
 

Assets/Scenes/SceneMain.unity

@@ -7686,7 +7686,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -1720, y: -880}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1649923699
 MonoBehaviour:
@@ -10442,7 +10442,7 @@ AudioSource:
   OutputAudioMixerGroup: {fileID: 0}
   m_audioClip: {fileID: 8300000, guid: fad5f40108e03ec4dbe42eb884f842c1, type: 3}
   m_PlayOnAwake: 1
-  m_Volume: 0.787
+  m_Volume: 0.3
   m_Pitch: 1
   Loop: 1
   Mute: 0