bug fixed

OkifuZ · Aug 21, 2024 · 5a9deb1 · 5a9deb1
1 parent bb4c27b
commit 5a9deb1
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 40 deletions.
diff --git a/Assets/Materials/Hammer.mat b/Assets/Materials/Hammer.mat
@@ -129,8 +129,8 @@ Material:
     - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:
-    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _BaseColor: {r: 0.6320754, g: 0.42297935, b: 0.21168566, a: 1}
+    - _Color: {r: 0.6320754, g: 0.4229793, b: 0.21168563, a: 1}
     - _EmissionColor: {r: 0.0754717, g: 0.0744037, b: 0.0744037, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity
@@ -5784,7 +5784,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   timeCounter: 0
-  countDownTimer: 90
+  countDownTimer: 60
   isCountDown: 1
   timerText: {fileID: 1796481398}
   LayerText: {fileID: 479628930}
@@ -27727,7 +27727,7 @@ Rigidbody:
   m_IsKinematic: 0
   m_Interpolate: 0
   m_Constraints: 0
-  m_CollisionDetection: 0
+  m_CollisionDetection: 3
 --- !u!1 &542055878680170255
 GameObject:
   m_ObjectHideFlags: 0
@@ -27855,7 +27855,7 @@ Rigidbody:
   m_IsKinematic: 0
   m_Interpolate: 0
   m_Constraints: 0
-  m_CollisionDetection: 0
+  m_CollisionDetection: 3
 --- !u!4 &570293979694578716
 Transform:
   m_ObjectHideFlags: 0
@@ -31922,7 +31922,7 @@ Rigidbody:
   m_IsKinematic: 0
   m_Interpolate: 0
   m_Constraints: 0
-  m_CollisionDetection: 0
+  m_CollisionDetection: 3
 --- !u!1 &1959316763359503625
 GameObject:
   m_ObjectHideFlags: 0
@@ -55060,7 +55060,7 @@ Rigidbody:
   m_IsKinematic: 0
   m_Interpolate: 0
   m_Constraints: 0
-  m_CollisionDetection: 0
+  m_CollisionDetection: 3
 --- !u!1 &5187765702524908545
 GameObject:
   m_ObjectHideFlags: 0
@@ -55268,7 +55268,7 @@ Rigidbody:
   m_IsKinematic: 0
   m_Interpolate: 0
   m_Constraints: 0
-  m_CollisionDetection: 0
+  m_CollisionDetection: 3
 --- !u!1 &5258456148060849113
 GameObject:
   m_ObjectHideFlags: 0
@@ -55514,7 +55514,7 @@ Rigidbody:
   m_IsKinematic: 0
   m_Interpolate: 0
   m_Constraints: 0
-  m_CollisionDetection: 0
+  m_CollisionDetection: 3
 --- !u!114 &5327742951666324528
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -71634,7 +71634,7 @@ Rigidbody:
   m_IsKinematic: 0
   m_Interpolate: 0
   m_Constraints: 0
-  m_CollisionDetection: 0
+  m_CollisionDetection: 3
 --- !u!1 &7894249338762593142
 GameObject:
   m_ObjectHideFlags: 0
@@ -73891,7 +73891,7 @@ Rigidbody:
   m_IsKinematic: 0
   m_Interpolate: 0
   m_Constraints: 0
-  m_CollisionDetection: 0
+  m_CollisionDetection: 3
 --- !u!1 &8955815992059982869
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Scripts/Active Ragdoll/DefaultBehaviour.cs b/Assets/Scripts/Active Ragdoll/DefaultBehaviour.cs
@@ -153,7 +153,10 @@ private void ProcessFloorChanged(bool onFloor) {
         }
         else {
             _activeRagdoll.onFloor = false;
-            StartCoroutine(teleport(_activeRagdoll, Controller.instance._currentEnvironment.transform.position));
+            if (Controller.instance._currentEnvironment != null)
+            {
+                StartCoroutine(teleport(_activeRagdoll, Controller.instance._currentEnvironment.transform.position));
+            }
             /*Vector3 diff = Controller.instance._currentEnvironment.transform.position - _activeRagdoll.PhysicalTorso.transform.position + new Vector3(0, 3, 0);
             var rbs = _activeRagdoll.PhysicalTorso.GetComponentsInChildren<Rigidbody>();
             foreach (var rb in rbs)

diff --git a/Assets/Scripts/Controller.cs b/Assets/Scripts/Controller.cs
@@ -189,6 +189,7 @@ public void JumpToComplete()
         // MakeEnvDisappear();
         canvas.gameObject.SetActive(false);
         SceneManager.LoadScene(2);
+        _layerNum = layerNum;
 
         GameObject go1 = GameObject.Find("Winner");
         GameObject go2 = GameObject.Find("Looser");
@@ -201,6 +202,8 @@ public void AfterReset()
         inMenu = false;
         paused = false;
 
+        _layerNum = layerNum;
+
         canvas.gameObject.SetActive(false);
         AfterResetDown = true;
         /*PauseMenu pauseMenu = canvas.GetComponent<PauseMenu>();
@@ -242,6 +245,8 @@ public void AfterPlay()
     {
         //Debug.Log("after play");
         canvas.gameObject.SetActive(false);
+
+        _layerNum = layerNum;
 
         inMenu = false;
         paused = false;

diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset
@@ -10,6 +10,8 @@ UnityConnectSettings:
   m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
   m_ConfigUrl: https://config.uca.cloud.unity3d.com
   m_DashboardUrl: https://dashboard.unity3d.com
+  m_CNEventUrl: https://cdp.cloud.unity.cn/v1/events
+  m_CNConfigUrl: https://cdp.cloud.unity.cn/config
   m_TestInitMode: 0
   CrashReportingSettings:
     m_EventUrl: https://perf-events.cloud.unity3d.com

diff --git a/Readme.md b/Readme.md
@@ -0,0 +1,23 @@
+# Blustoon
+
+IEG魔方工作室客户端组超新星项目 
+
+Author: Siyan Zhu (Okifu)
+
+## Game Content
+
+缝合***Animal Party***和***Splatoon***：Blustoon = Animal Party + Splatoon ！
+
+有2个玩家，1P2P，**游戏目标**是尽可能多的用喷枪染色！（喷就完事）
+
+除了喷枪，还有武器锤子，两者都可以阻碍对方的行动喔~
+
+共有三关，每关倒计时60s，时间结束地板会破碎，掉到下一关。
+三关结束后触发结算界面~
+
+
+> 游戏机制可能难以短时间全部发掘，请慢慢享受
+
+## Game Control
+
+![alt text](image.png)
diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt
@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Project
+  m_Title: Inspector
   m_RootView: {fileID: 3}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -43,8 +43,8 @@ MonoBehaviour:
     y: 0
     width: 691
     height: 762
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 16}
   m_Panes:
   - {fileID: 16}
@@ -145,7 +145,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 119
+  controlID: 64
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -170,7 +170,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 100}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 1
-  controlID: 74
+  controlID: 65
 --- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -196,7 +196,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 50}
   m_MaxSize: {x: 24288, y: 8096}
   vertical: 0
-  controlID: 75
+  controlID: 66
 --- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -216,8 +216,8 @@ MonoBehaviour:
     y: 0
     width: 489
     height: 762
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
@@ -242,8 +242,8 @@ MonoBehaviour:
     y: 0
     width: 736
     height: 762
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 102, y: 121}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 13}
   m_Panes:
   - {fileID: 17}
@@ -296,8 +296,8 @@ MonoBehaviour:
     y: 0
     width: 644
     height: 1299
-  m_MinSize: {x: 275, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 276, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 19}
   m_Panes:
   - {fileID: 19}
@@ -479,7 +479,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: baf4fdffae17feff641dfeff1a45010020660100
+      m_ExpandedIDs: 32c2fffffcc2fffffec5ffff62c6ffff96c6ffff1cdcffffe4dcfffff2dfffff46e0ffff6ae0ffff06fbffff96a40000aca4000018a5000076a50000c2a50000c4a5000002a6000028a60000d6a60000f2a6000034a700003ea700005ea7000090a700000ca8000052a8000056a80000baa80000e2a80000e8a8000002aa00002caa000080aa000006ab000088ab0000b0ab0000caab000040ac0000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -990,9 +990,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 389.39587, y: 106.70711, z: -4.0641174}
+    m_Target: {x: -5.437088, y: 1.2914402, z: 0.108523406}
     speed: 2
-    m_Value: {x: 389.39587, y: 106.70711, z: -4.0641174}
+    m_Value: {x: -5.437088, y: 1.2914402, z: 0.108523406}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1042,9 +1042,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 443.18222
+    m_Target: 0.5835332
     speed: 2
-    m_Value: 443.18222
+    m_Value: 0.5835332
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -1062,7 +1062,7 @@ MonoBehaviour:
     m_FarClip: 10000
     m_DynamicClip: 1
     m_OcclusionCulling: 0
-  m_LastSceneViewRotation: {x: 0.09175568, y: -0.63982517, z: 0.07738855, w: 0.7592635}
+  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
@@ -1159,24 +1159,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets
+    - Assets/Materials
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets
+  - Assets/Materials
   m_LastFoldersGridSize: 16
   m_LastProjectPath: C:\unity\821\blustoon2
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 79}
-    m_SelectedIDs: 08410000
-    m_LastClickedID: 16648
-    m_ExpandedIDs: 0000000008410000c441000000ca9a3bffffff7f
+    m_SelectedIDs: fc7f0000
+    m_LastClickedID: 32764
+    m_ExpandedIDs: 00000000de7f000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1204,7 +1204,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 
+    m_ExpandedIDs: 00000000de7f0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1235,18 +1235,18 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: c6230000a01002007a020000742a010050d101001ec3020022c30200ac3a0300fc0b0200122c02004cd90100020c0200069e02008ee207001c3b02005e5c0000785d0000965e0000445b0000b8510000cea70000c0a90000e8b90000a6e0000096e0000072e0000062e0000086e00000487e00007683000060e1020058150300261b0300582a030004840000421101007e610100086a0100468500008e600000e0ab000024e1000048750100044100005afa0000ec580100cc7f0800401a0100e4410000dad1000000000000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: GameEntry
-      m_OriginalName: GameEntry
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 83120
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 11}
     m_CreateAssetUtility:

diff --git a/image.png b/image.png