Kaynağa Gözat

狼关卡效果

lvjincheng 4 yıl önce
ebeveyn
işleme
fa2731b030

BIN
Assets/ArtAsset/Hunter/Models/Wolf/Wolf.fbx


+ 8 - 11
Assets/ArtAsset/Hunter/Models/Wolf/Wolf.fbx.meta

@@ -5,19 +5,16 @@ ModelImporter:
   internalIDToNameTable:
   - first:
       74: 1827226128182048838
-    second: Wolf Idle
-  - first:
-      74: -299696210421356986
     second: Wolf idle
   - first:
       74: 8357948280470776873
     second: Wolf Death
   - first:
-      74: 1431562694141443742
-    second: Wolf walk slow
+      74: -4863659618802093921
+    second: Wolf Walk Slow
   - first:
-      74: -3834563375888344444
-    second: Wolf run
+      74: 2905945804606988935
+    second: Wolf Run
   - first:
       74: -4749165719307540617
     second: Wolf Attack Jump
@@ -90,8 +87,8 @@ ModelImporter:
       name: Wolf Death
       takeName: Take 001
       internalID: 0
-      firstFrame: 255
-      lastFrame: 286
+      firstFrame: 270
+      lastFrame: 285
       wrapMode: 0
       orientationOffsetY: 0
       level: 0
@@ -116,7 +113,7 @@ ModelImporter:
       maskSource: {instanceID: 0}
       additiveReferencePoseFrame: 0
     - serializedVersion: 16
-      name: Wolf walk slow
+      name: Wolf Walk Slow
       takeName: Take 001
       internalID: 0
       firstFrame: 194
@@ -145,7 +142,7 @@ ModelImporter:
       maskSource: {instanceID: 0}
       additiveReferencePoseFrame: 0
     - serializedVersion: 16
-      name: Wolf run
+      name: Wolf Run
       takeName: Take 001
       internalID: 0
       firstFrame: 933

Dosya farkı çok büyük olduğundan ihmal edildi
+ 344 - 338
Assets/ArtAsset/Hunter/Models/Wolf/Wolf.prefab


+ 8 - 3
Assets/ArtAsset/Hunter/StylizedNatureBundle/Materials/M_SNB_Cloud.mat

@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: M_SNB_Cloud
-  m_Shader: {fileID: 208, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: cc4347574b823934ba11785e25895920, type: 3}
   m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
   m_LightmapFlags: 0
   m_EnableInstancingVariants: 0
@@ -23,6 +23,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _Cube:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _DetailAlbedoMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -64,7 +68,7 @@ Material:
     - _CameraNearFadeDistance: 1
     - _ColorMode: 0
     - _Cull: 2
-    - _Cutoff: 0.5
+    - _Cutoff: 0.747
     - _DetailNormalMapScale: 1
     - _DistortionBlend: 0.5
     - _DistortionEnabled: 0
@@ -96,6 +100,7 @@ Material:
     - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
     - _EmisColor: {r: 0.06430225, g: 0.076622665, b: 0.16037738, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _ReflectColor: {r: 1, g: 1, b: 1, a: 0.5}
     - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
-    - _TintColor: {r: 0.111249544, g: 0.14543821, b: 0.18867922, a: 0.5}
+    - _TintColor: {r: 0.111249544, g: 0.14543821, b: 0.18867922, a: 0.039215688}
   m_BuildTextureStacks: []

+ 1 - 0
Assets/BowArrow/Scenes/GameChallengeScene/DayToNight.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UI;
 using UnityStandardAssets.ImageEffects;
 
 public class DayToNight : MonoBehaviour

+ 20 - 0
Assets/BowArrow/Scenes/GameChallengeScene/FogDoTween.cs

@@ -0,0 +1,20 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class FogDoTween : MonoBehaviour
+{
+    Vector3 eularAngles;
+    
+    void Start()
+    {
+        this.eularAngles = this.transform.eulerAngles;
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        eularAngles.y += Time.deltaTime;
+        this.transform.eulerAngles = eularAngles;
+    }
+}

+ 11 - 0
Assets/BowArrow/Scenes/GameChallengeScene/FogDoTween.cs.meta

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

+ 43 - 698
Assets/BowArrow/Scenes/GameChallengeScene/GameChallenge.unity

@@ -1269,139 +1269,6 @@ Transform:
   m_Father: {fileID: 9774287}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 14.141304, y: -41.565872, z: -6.8664064}
---- !u!1 &61227747
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 61227748}
-  - component: {fileID: 61227751}
-  - component: {fileID: 61227750}
-  - component: {fileID: 61227749}
-  m_Layer: 0
-  m_Name: Button (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &61227748
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 61227747}
-  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: 220676646}
-  m_Father: {fileID: 2061010500}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 50, y: 120}
-  m_SizeDelta: {x: 200, y: 50}
-  m_Pivot: {x: 0, y: 0}
---- !u!114 &61227749
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 61227747}
-  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: 61227750}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 220286525}
-        m_TargetAssemblyTypeName: DayToNight, Assembly-CSharp
-        m_MethodName: EnterNight
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
---- !u!114 &61227750
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 61227747}
-  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: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  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 &61227751
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 61227747}
-  m_CullTransparentMesh: 1
 --- !u!1 &63191685
 GameObject:
   m_ObjectHideFlags: 0
@@ -4967,85 +4834,6 @@ MonoBehaviour:
   cameras:
   - {fileID: 954346089}
   - {fileID: 1219950848}
---- !u!1 &220676645
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 220676646}
-  - component: {fileID: 220676648}
-  - component: {fileID: 220676647}
-  m_Layer: 0
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &220676646
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 220676645}
-  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: 61227748}
-  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 &220676647
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 220676645}
-  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.19607843, g: 0.19607843, b: 0.19607843, 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: 25
-    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: "\u8FDB\u5165\u665A\u4E0A"
---- !u!222 &220676648
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 220676645}
-  m_CullTransparentMesh: 1
 --- !u!1 &221915731 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 178576, guid: a4ac6ff60dfbecb41b484473aacd5102, type: 3}
@@ -11317,81 +11105,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: afaa0ff317d7c444f8f9c4c6d1b6a51a, type: 3}
   m_PrefabInstance: {fileID: 513796990}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &515424777
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 515424778}
-  - component: {fileID: 515424780}
-  - component: {fileID: 515424779}
-  m_Layer: 0
-  m_Name: BG
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &515424778
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 515424777}
-  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: 2061010500}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 300, y: 220}
-  m_Pivot: {x: 0, y: 0}
---- !u!114 &515424779
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 515424777}
-  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: 0, g: 0, b: 0, a: 0.60784316}
-  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: 0}
-  m_Type: 0
-  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 &515424780
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 515424777}
-  m_CullTransparentMesh: 1
 --- !u!1 &515585521 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 104774, guid: 196a6be01d89f9840bebaad593a4bf7f, type: 3}
@@ -14194,55 +13907,63 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
       propertyPath: m_LocalScale.x
-      value: 0.24107003
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
       propertyPath: m_LocalScale.y
-      value: 0.24106997
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
       propertyPath: m_LocalScale.z
-      value: 0.24107
+      value: 2.4581
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 160.01129
+      value: 155.52
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 14.69
+      value: 13
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 136.65697
+      value: 136
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
       propertyPath: m_LocalRotation.w
-      value: -0.20649025
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0.20649025
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0.6762853
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.6762853
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
+      value: 180
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
-      value: -213.958
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2300000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
+      propertyPath: m_CastShadows
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2300000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
+      propertyPath: m_ReceiveShadows
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2300000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
       propertyPath: m_Materials.Array.data[0]
@@ -15715,79 +15436,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a35926f9f2e67e848868c7fbabe6c2f0, type: 3}
---- !u!1001 &740051270
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 1148547331}
-    m_Modifications:
-    - target: {fileID: 100000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
-      propertyPath: m_Name
-      value: Cloud (1)
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.24106994
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.24107
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0.24107
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 144.95
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 14.69
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 140.32
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.39011326
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0.39011326
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0.5897556
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0.5897556
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: -113.032
-      objectReference: {fileID: 0}
-    - target: {fileID: 2300000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: e3342b75e752e744091eeeab42d0461f, type: 2}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
 --- !u!1 &740342952
 GameObject:
   m_ObjectHideFlags: 0
@@ -20400,7 +20048,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: 28.636137, 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
@@ -21604,139 +21252,6 @@ MeshCollider:
   m_Convex: 0
   m_CookingOptions: 30
   m_Mesh: {fileID: 4300000, guid: c1b942116a63fd744ac45f76e99363e4, type: 3}
---- !u!1 &1125121606
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1125121607}
-  - component: {fileID: 1125121610}
-  - component: {fileID: 1125121609}
-  - component: {fileID: 1125121608}
-  m_Layer: 0
-  m_Name: Button
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1125121607
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1125121606}
-  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: 1524908768}
-  m_Father: {fileID: 2061010500}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 50, y: 50}
-  m_SizeDelta: {x: 200, y: 50}
-  m_Pivot: {x: 0, y: 0}
---- !u!114 &1125121608
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1125121606}
-  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: 1125121609}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 220286525}
-        m_TargetAssemblyTypeName: DayToNight, Assembly-CSharp
-        m_MethodName: EnterDay
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
---- !u!114 &1125121609
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1125121606}
-  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: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  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 &1125121610
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1125121606}
-  m_CullTransparentMesh: 1
 --- !u!4 &1126956492 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 435168, guid: a4ac6ff60dfbecb41b484473aacd5102, type: 3}
@@ -21926,7 +21441,6 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 448524764}
-  - {fileID: 1785247462}
   - {fileID: 1827817154}
   m_Father: {fileID: 220286524}
   m_RootOrder: 1
@@ -23854,7 +23368,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: 28.636137, 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
@@ -25919,6 +25433,23 @@ Transform:
   m_Father: {fileID: 220286524}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1327901351 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 100000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
+  m_PrefabInstance: {fileID: 658194725}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1327901352
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1327901351}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1317dbe2cd7cd5f42a07b105aab238e0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1328648116
 GameObject:
   m_ObjectHideFlags: 0
@@ -29800,85 +29331,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 435376, guid: bf6bdabf8b66a4945bab1ad53f4dd11d, type: 3}
   m_PrefabInstance: {fileID: 358581707}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &1524908767
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1524908768}
-  - component: {fileID: 1524908770}
-  - component: {fileID: 1524908769}
-  m_Layer: 0
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1524908768
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1524908767}
-  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: 1125121607}
-  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 &1524908769
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1524908767}
-  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.19607843, g: 0.19607843, b: 0.19607843, 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: 25
-    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: "\u8FDB\u5165\u767D\u5929"
---- !u!222 &1524908770
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1524908767}
-  m_CullTransparentMesh: 1
 --- !u!4 &1527579190 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 412776, guid: 962d29a3f95fdb94abaf02b9e6e30e89, type: 3}
@@ -34988,11 +34440,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1784251688}
   m_CullTransparentMesh: 0
---- !u!4 &1785247462 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 400000, guid: f21aed30ae5fb9549956687f3bf010dd, type: 3}
-  m_PrefabInstance: {fileID: 740051270}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1785985777
 GameObject:
   m_ObjectHideFlags: 0
@@ -35979,7 +35426,7 @@ GameObject:
   - component: {fileID: 1827817154}
   - component: {fileID: 1827817153}
   m_Layer: 0
-  m_Name: Directional Light (1)
+  m_Name: Directional Light
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -36059,7 +35506,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1148547331}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 67.857, y: 15.54, z: -136.828}
 --- !u!1 &1829750918
 GameObject:
@@ -40149,108 +39596,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: afaa0ff317d7c444f8f9c4c6d1b6a51a, type: 3}
   m_PrefabInstance: {fileID: 2054871366}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &2061010499
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2061010500}
-  - component: {fileID: 2061010503}
-  - component: {fileID: 2061010502}
-  - component: {fileID: 2061010501}
-  m_Layer: 0
-  m_Name: CanvasDayToNight
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &2061010500
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2061010499}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
-  m_Children:
-  - {fileID: 515424778}
-  - {fileID: 1125121607}
-  - {fileID: 61227748}
-  m_Father: {fileID: 0}
-  m_RootOrder: 6
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0}
---- !u!114 &2061010501
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2061010499}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
---- !u!114 &2061010502
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2061010499}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 1
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 1280, y: 720}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 1
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
---- !u!223 &2061010503
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2061010499}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 0
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
 --- !u!1 &2068500569
 GameObject:
   m_ObjectHideFlags: 0
@@ -41934,7 +41279,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: 47.272274, 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

+ 1 - 1
Assets/BowArrow/Scripts/View/DeviceReconnectView.cs

@@ -40,7 +40,7 @@ public class DeviceReconnectView : MonoBehaviour
         GameMgr.ins.addLockerForGamePause(this);
 
         //用于测试阶段,暂时屏蔽该页面
-        // Destroy(this.gameObject); if (onComplete != null) onComplete();
+        Destroy(this.gameObject); if (onComplete != null) onComplete();
     }
 
     void OnDestroy()

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor