关卡调整

Assets/ArtAsset/Hunter/Models/Rabbit/Rabbit.prefab

@@ -1929,7 +1929,7 @@ NavMeshAgent:
   m_Enabled: 1
   m_AgentTypeID: 0
   m_Radius: 0.5
-  m_Speed: 3
+  m_Speed: 2
   m_Acceleration: 100
   avoidancePriority: 50
   m_AngularSpeed: 720

Assets/ArtAsset/Hunter/Models/Yeji/Yeji.prefab

@@ -1745,10 +1745,10 @@ NavMeshAgent:
   m_AutoTraverseOffMeshLink: 1
   m_AutoBraking: 1
   m_AutoRepath: 1
-  m_Height: 2
+  m_Height: 0.88
   m_BaseOffset: 0
   m_WalkableMask: 4294967295
-  m_ObstacleAvoidanceType: 0
+  m_ObstacleAvoidanceType: 4
 --- !u!114 &919132149545680527
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1761,7 +1761,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5cc1798b39151d04aabb10b592d3c469, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  treeAreaRecorder: {fileID: 0}
 --- !u!1 &3650413470458053231
 GameObject:
   m_ObjectHideFlags: 0

Assets/BowArrow/Resources/Audios/Animal/rabbit_die.mp3.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 24e3a3cd16d372442b1aad342ec45418
-AudioImporter:
-  externalObjects: {}
-  serializedVersion: 6
-  defaultSettings:
-    loadType: 0
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 1
-    conversionMode: 0
-  platformSettingOverrides: {}
-  forceToMono: 0
-  normalize: 1
-  preloadAudioData: 1
-  loadInBackground: 0
-  ambisonic: 0
-  3D: 1
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/BowArrow/Scenes/GameChallenge/TerrainReader.cs

@@ -1,19 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class TerrainReader : MonoBehaviour
-{
-    // Start is called before the first frame update
-    void Start()
-    {
-        Terrain t = GetComponent<Terrain>();
-        
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-}

Assets/BowArrow/Scenes/GameChallenge/TerrainReader.cs.meta

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

Assets/BowArrow/Scenes/GameChallenge/ChallengeGameMode.cs → Assets/BowArrow/Scenes/GameChallengeScene/ChallengeGameMode.cs

@@ -26,8 +26,11 @@ public abstract class ChallengeGameMode : GameMode
     public int arrowCountMax = 0;
     //倒计时
     public float time = 60;
-    //关卡等级
+    //当前关卡等级
     public int currentlevel;
+    //上一关点击进入下一关，会把信息记录到这
+    public static string enterNextLevel;
+    public string nextLevel;
 
 
     public ChallengeGameMode(GameMgr gameMgr) : base(gameMgr) {
@@ -41,6 +44,11 @@ public abstract class ChallengeGameMode : GameMode
                 arrowCount--;
             }
         };
+
+        if (enterNextLevel != null) {
+            nextLevel = enterNextLevel;
+            enterNextLevel = null;
+        }
     }
 
     public override bool DoNextShoot() { 
@@ -70,6 +78,10 @@ public abstract class ChallengeGameMode : GameMode
     protected void AddSelectLevelView() {
         this.gameMgr.transform.Find("HuntGameSelectLevelView").gameObject.SetActive(true);
     }
+    //添加通用游戏界面
+    public void AddHuntGameView() {
+        this.gameMgr.transform.Find("HunterGameView").gameObject.SetActive(true);
+    }
 
     //宣布游戏结束
     protected void AnnounceGameOver() {

Assets/BowArrow/Scenes/GameChallenge/GameChallenge.unity → Assets/BowArrow/Scenes/GameChallengeScene/GameChallenge.unity

@@ -4744,12 +4744,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1544215145}
-  m_Father: {fileID: 909015801}
-  m_RootOrder: 3
+  m_Father: {fileID: 909398127}
+  m_RootOrder: 0
   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: -120, y: -120}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 100.5, y: -28}
   m_SizeDelta: {x: 201, y: 56}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &208075073
@@ -6061,12 +6061,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1725321790}
-  m_Father: {fileID: 909015801}
-  m_RootOrder: 4
+  m_Father: {fileID: 909398127}
+  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: 120, y: -120}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 331.5, y: -28}
   m_SizeDelta: {x: 201, y: 56}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &265571731
@@ -6133,7 +6133,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 1d745dd9e0569e84ebb0065d8cd1cf72, type: 3}
+  m_Sprite: {fileID: 21300000, guid: eac2f624d7125444db238a4b28429c93, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -13186,22 +13186,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 153725242}
     m_Modifications:
-    - target: {fileID: 919132149545680526, guid: f81d257c3d358e64991d48c77b83621b, type: 3}
-      propertyPath: m_Height
-      value: 0.88
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149545680526, guid: f81d257c3d358e64991d48c77b83621b, type: 3}
-      propertyPath: m_ObstacleAvoidanceType
-      value: 4
-      objectReference: {fileID: 0}
     - target: {fileID: 3640209499596699500, guid: f81d257c3d358e64991d48c77b83621b, type: 3}
       propertyPath: m_Name
       value: Yeji
       objectReference: {fileID: 0}
-    - target: {fileID: 3640209499596699500, guid: f81d257c3d358e64991d48c77b83621b, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 4165636056609648086, guid: f81d257c3d358e64991d48c77b83621b, type: 3}
       propertyPath: m_RootOrder
       value: 0
@@ -18270,8 +18258,7 @@ RectTransform:
   - {fileID: 142920492}
   - {fileID: 1676499348}
   - {fileID: 913201302}
-  - {fileID: 208075072}
-  - {fileID: 265571730}
+  - {fileID: 909398127}
   m_Father: {fileID: 279869869}
   m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -18353,6 +18340,86 @@ Canvas:
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
+--- !u!1 &909398126
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 909398127}
+  - component: {fileID: 909398129}
+  - component: {fileID: 909398128}
+  m_Layer: 5
+  m_Name: Btns
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &909398127
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 909398126}
+  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_Children:
+  - {fileID: 208075072}
+  - {fileID: 265571730}
+  - {fileID: 1936560197}
+  m_Father: {fileID: 909015801}
+  m_RootOrder: 3
+  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: -115}
+  m_SizeDelta: {x: 663, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &909398128
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 909398126}
+  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 &909398129
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 909398126}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 30
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &913201301
 GameObject:
   m_ObjectHideFlags: 0
@@ -20333,7 +20400,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 29.683897, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1047161075
@@ -23787,7 +23854,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 29.683897, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1203594963
@@ -26296,6 +26363,85 @@ Transform:
   m_Father: {fileID: 2142057162}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 1.4396435e-14, y: 1.1539039e-14, z: -8.045527}
+--- !u!1 &1358723700
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1358723701}
+  - component: {fileID: 1358723703}
+  - component: {fileID: 1358723702}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1358723701
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1358723700}
+  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_Children: []
+  m_Father: {fileID: 1936560197}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1358723702
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1358723700}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0.22955985, b: 0.3773585, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
+    m_FontSize: 24
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8FD4\u56DE\u4E3B\u9875"
+--- !u!222 &1358723703
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1358723700}
+  m_CullTransparentMesh: 1
 --- !u!1001 &1361860292
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -33427,7 +33573,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0.22955985, b: 0.3773585, a: 1}
+  m_Color: {r: 0.12406753, g: 0.3773585, b: 0.0014239663, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -33447,7 +33593,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u8FD4\u56DE\u4E3B\u9875"
+  m_Text: "\u4E0B\u4E00\u5173"
 --- !u!222 &1725321792
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -37768,6 +37914,127 @@ Transform:
   m_Father: {fileID: 261702531}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: -0.0000014764512, y: 0.000002569107, z: 170.90225}
+--- !u!1 &1936560196
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1936560197}
+  - component: {fileID: 1936560200}
+  - component: {fileID: 1936560199}
+  - component: {fileID: 1936560198}
+  m_Layer: 5
+  m_Name: Btn3
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1936560197
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1936560196}
+  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_Children:
+  - {fileID: 1358723701}
+  m_Father: {fileID: 909398127}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 562.5, y: -28}
+  m_SizeDelta: {x: 201, y: 56}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1936560198
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1936560196}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1936560199}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &1936560199
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1936560196}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 1d745dd9e0569e84ebb0065d8cd1cf72, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1936560200
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1936560196}
+  m_CullTransparentMesh: 1
 --- !u!1 &1940020958
 GameObject:
   m_ObjectHideFlags: 0
@@ -41667,7 +41934,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 49.367794, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2142579590

Assets/BowArrow/Scenes/GameChallenge/HuntGameSelectLevelView.cs → Assets/BowArrow/Scenes/GameChallengeScene/HuntGameSelectLevelView.cs

@@ -20,8 +20,8 @@ public class HuntGameSelectLevelView : MonoBehaviour
                  button.onClick.AddListener(delegate(){
                      ChallengeGameMode gameMode = (ChallengeGameMode) GameMgr.ins.gameMode;
                      gameMode.SetLevel(levelRecord);
+                     gameMode.AddHuntGameView();
                      Destroy(this.gameObject);
-                     gameMode.gameMgr.transform.Find("HunterGameView").gameObject.SetActive(true);
                      AudioMgr.ins.PlayBtn();
                 });
             // }

Assets/BowArrow/Scenes/GameChallenge/HunterGameSettleView.cs → Assets/BowArrow/Scenes/GameChallengeScene/HunterGameSettleView.cs

@@ -22,9 +22,21 @@ public class HunterGameSettleView : MonoBehaviour
         else if (res == "失败") {
             this.transform.Find("Win").gameObject.SetActive(false);
         }
-        this.transform.Find("Btn1").GetComponent<Button>().onClick.AddListener(TryAgain);
-        this.transform.Find("Btn2").GetComponent<Button>().onClick.AddListener(BackHome);
+        this.transform.Find("Btns/Btn1").GetComponent<Button>().onClick.AddListener(TryAgain);
+        this.transform.Find("Btns/Btn3").GetComponent<Button>().onClick.AddListener(BackHome);
+        CheckOpenNextLevelBtn(gameMode, res);
+    }
 
+    void CheckOpenNextLevelBtn(ChallengeGameMode gameMode, string gameRes) {
+        Transform btnT = this.transform.Find("Btns/Btn2");
+        bool open = gameRes == "胜利" && gameMode.currentlevel < 5;
+        btnT.gameObject.SetActive(open);
+        if (open) {
+            btnT.GetComponent<Button>().onClick.AddListener(delegate() {
+                ChallengeGameMode.enterNextLevel = (gameMode.currentlevel + 1).ToString();
+                TryAgain();
+            });
+        }
     }
 
     public void TryAgain() {

Assets/ArtAsset/Hunter/Models/Rabbit/Rabbit.cs → Assets/BowArrow/Scenes/GameChallengeScene/Rabbit.cs

@@ -73,7 +73,7 @@ public class Rabbit : TargetAnimal
         this.agent.enabled = false;
         PuaseAutoStrategy();
         onDie?.Invoke(this);
-        AudioMgr.ins.PlayAnimalEffect("rabbit_die", AudioMgr.GetAudioSource(this.gameObject));
+        AudioMgr.ins.PlayAnimalEffect("rabbit_injured", AudioMgr.GetAudioSource(this.gameObject));
         AudioMgr.ins.PlayCheer(true);
     }
 
@@ -137,10 +137,11 @@ public class Rabbit : TargetAnimal
     //是否已经接近目的地（寻路完成判断）
     bool HasCloseToDestination() {
         if (!moving) return true;
-        if (movingTime > 0.1) {
-            if (this.agent.velocity.magnitude < 0.05f) {
-                return true;
-            }
+        if (Vector3.Distance(this.agent.nextPosition, this.agent.destination) < 0.15f) {
+            return true;
+        }
+        if (movingTime > 0.1f && this.agent.velocity.magnitude < 0.05f) {
+            return true;
         }
         return false;
     }
@@ -179,15 +180,23 @@ public class Rabbit : TargetAnimal
             RandomWillStayTime();
         } 
         if (autoMoving) {
-            if (moving) {
-                autoMovingTime += Time.deltaTime;
-            } else if (autoMovingTime < willMoveTime) {
-                RandomMove();
-            } else if (autoMovingTime >= willMoveTime) {
+            // if (moving) {
+            //     autoMovingTime += Time.deltaTime;
+            // } else if (autoMovingTime < willMoveTime) {
+            //     RandomMove();
+            // } else if (autoMovingTime >= willMoveTime) {
+            //     Stay();
+            //     RandomWillMoveTime();
+            //     autoMoving = false;
+            //     autoMovingTime = 0;
+            // }
+            if (!moving) {
                 Stay();
                 RandomWillMoveTime();
                 autoMoving = false;
                 autoMovingTime = 0;
+            } else {
+                autoMovingTime += Time.deltaTime;
             }
         }
     }

Assets/BowArrow/Scenes/GameChallenge/RabbitHuntGameMode.cs → Assets/BowArrow/Scenes/GameChallengeScene/RabbitHuntGameMode.cs

@@ -8,13 +8,18 @@ public class RabbitHuntGameMode : ChallengeGameMode
     public RabbitHuntGameMode(GameMgr gameMgr) : base(gameMgr) {
         this.animalTypeID = 0;
         animalPrefab = animalsBaseT.Find("Rabbit").gameObject;
-        baseCreateDistance = 5;
+        baseCreateDistance = 8;
         BanBowReady();
     }
 
     public override void Start() {
         UnbanBowReady();
-        AddSelectLevelView();
+        if (nextLevel != null) {
+            SetLevel(int.Parse(nextLevel));
+            AddHuntGameView();
+        } else {
+            AddSelectLevelView();
+        }
     }
 
     //动物的创建列表（数组元素表示动物颜色样式）
@@ -27,30 +32,31 @@ public class RabbitHuntGameMode : ChallengeGameMode
         currentlevel = level;
         if (level == 1) {
             animalCreateList = new int[]{1, 1};
-            arrowCountMax = arrowCount = 5;
+            arrowCountMax = arrowCount = 4;
         }
         else if (level == 2) {
             animalCreateList = new int[]{2, 2};
-            arrowCountMax = arrowCount = 6;
+            arrowCountMax = arrowCount = 8;
         }
         else if (level == 3) {
             animalCreateList = new int[]{3, 3};
-            arrowCountMax = arrowCount = 7;
+            arrowCountMax = arrowCount = 12;
         }
         else if (level == 4) {
             animalCreateList = new int[]{1, 1, 2, 2};
-            arrowCountMax = arrowCount = 8;
+            arrowCountMax = arrowCount = 12;
         }
         else if (level == 5) {
             animalCreateList = new int[]{1, 1, 1, 3, 3, 3};
-            arrowCountMax = arrowCount = 10;
+            arrowCountMax = arrowCount = 24;
         }
         if (animalCreateList != null) animalCountMax = animalCount = animalCreateList.Length;
+        time = arrowCountMax * 10;
         CreateAnimal();
     }
 
     float baseCreateDistance = 0;
-    float plusCreateDistance = 3;
+    float plusCreateDistance = 2.5f;
 
     void CreateAnimal() {
         if (animalCreateIndex >= animalCreateList.Length) return;

Assets/BowArrow/Scenes/GameChallenge/WolfHuntGameMode.cs → Assets/BowArrow/Scenes/GameChallengeScene/WolfHuntGameMode.cs

@@ -19,7 +19,12 @@ public class WolfHuntGameMode : ChallengeGameMode
 
     public override void Start() {
         UnbanBowReady();
-        AddSelectLevelView();
+        if (nextLevel != null) {
+            SetLevel(int.Parse(nextLevel));
+            AddHuntGameView();
+        } else {
+            AddSelectLevelView();
+        }
     }
 
     //动物的创建列表（数组元素表示动物颜色样式）

Assets/BowArrow/Scenes/GameChallenge/YejiHuntGameMode.cs → Assets/BowArrow/Scenes/GameChallengeScene/YejiHuntGameMode.cs

@@ -19,9 +19,14 @@ public class YejiHuntGameMode : ChallengeGameMode
 
     public override void Start() {
         UnbanBowReady();
-        // AddSelectLevelView();
-        SetLevel(1);
-        gameMgr.transform.Find("HunterGameView").gameObject.SetActive(true);
+        if (nextLevel != null) {
+            SetLevel(int.Parse(nextLevel));
+            AddHuntGameView();
+        } else {
+            AddSelectLevelView();
+        }
+        // SetLevel(1);
+        // gameMgr.transform.Find("HunterGameView").gameObject.SetActive(true);
     }
 
     //表示能创建的最大动物数量
@@ -33,9 +38,9 @@ public class YejiHuntGameMode : ChallengeGameMode
     public override void SetLevel(int level) {
         currentlevel = level;
         createCountMax = level + 1;
-        arrowCountMax = arrowCount = 5 + level * 3;
-        time = 60 + (level - 1) * 10;
         animalCountMax = animalCount = createCountMax;
+        arrowCountMax = arrowCount = animalCountMax * 3 * 2;
+        time = arrowCountMax * 10;
         CreateAnimal();
     }
 

ProjectSettings/EditorBuildSettings.asset

@@ -18,6 +18,6 @@ EditorBuildSettings:
     path: Assets/BowArrow/Scenes/Game.unity
     guid: 3ee64920a7ce6dd4782fcc656bb2b337
   - enabled: 1
-    path: Assets/BowArrow/Scenes/GameChallenge/GameChallenge.unity
+    path: Assets/BowArrow/Scenes/GameChallengeScene/GameChallenge.unity
     guid: 983e1d3256c7dbe49accee6b31bb6d07
   m_configObjects: {}