调整-挑战场景校准靶子，自动注册用户名，地磁校准按钮

Assets/BowArrow/Scenes/GameChallengeScene/校准用的靶子/ChallengeTargetForResetView.cs

@@ -0,0 +1,29 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using DG.Tweening;
+
+public class ChallengeTargetForResetView : MonoBehaviour
+{
+    public static ChallengeTargetForResetView ins;
+
+    void Awake()
+    {
+        ins = this;
+    }
+
+    void OnDestroy()
+    {
+        if (ins == this) ins = null;
+    }
+
+    public static void DestroyDelay() {
+        if (!ins) return;
+        Sequence seq = DOTween.Sequence();
+        seq.AppendInterval(3);
+        seq.AppendCallback(() => {
+            Destroy(ins.gameObject);
+        });
+        seq.SetUpdate(true);
+    }
+}

Assets/BowArrow/Scenes/GameChallengeScene/校准用的靶子/ChallengeTargetForResetView.cs.meta

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

Assets/BowArrow/Scenes/GameChallengeScene/校准用的靶子/TargetObject.mat

@@ -81,6 +81,6 @@ Material:
     - _UseUIAlphaClip: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 0.6509804}
+    - _Color: {r: 1, g: 1, b: 1, a: 0.39215687}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
   m_BuildTextureStacks: []

Assets/BowArrow/Scenes/GameChallengeScene/校准用的靶子/TargetObject.prefab

@@ -9,6 +9,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2297963711468612111}
+  - component: {fileID: 3572846271554756120}
   m_Layer: 0
   m_Name: TargetObject
   m_TagString: Untagged
@@ -28,153 +29,21 @@ Transform:
   m_LocalScale: {x: 0.845, y: 0.5, z: 0.845}
   m_Children:
   - {fileID: 2297963713168495769}
-  - {fileID: 2297963711637775630}
-  - {fileID: 2297963713090592481}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: -84, y: -180, z: 0}
---- !u!1 &2297963711637775631
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2297963711637775630}
-  - component: {fileID: 2297963711637775627}
-  - component: {fileID: 2297963711637775628}
-  - component: {fileID: 2297963711637775629}
-  m_Layer: 0
-  m_Name: Box023
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2297963711637775630
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2297963711637775631}
-  m_LocalRotation: {x: -0.0871557, y: -0, z: -0, w: 0.9961948}
-  m_LocalPosition: {x: -0.6939951, y: -0.52999973, z: -2.9800007}
-  m_LocalScale: {x: 0.9499999, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 2297963711468612111}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &2297963711637775627
-MeshFilter:
+--- !u!114 &3572846271554756120
+MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2297963711637775631}
-  m_Mesh: {fileID: -8148374250349615983, guid: 2c2b9827a3e1ecf4f9a6c6c818c6fdbe, type: 3}
---- !u!23 &2297963711637775628
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2297963711637775631}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: dc465212ebc53bd4486a8c63bedbdbda, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!64 &2297963711637775629
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2297963711637775631}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: -8148374250349615983, guid: 2c2b9827a3e1ecf4f9a6c6c818c6fdbe, type: 3}
---- !u!1 &2297963713090592482
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2297963713090592481}
-  - component: {fileID: 2297963713090592511}
-  m_Layer: 0
-  m_Name: HitFade
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2297963713090592481
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2297963713090592482}
-  m_LocalRotation: {x: -0.08715574, y: 0, z: -0, w: 0.9961947}
-  m_LocalPosition: {x: -0.004, y: -0.082, z: -0.748}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 2297963711468612111}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!64 &2297963713090592511
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2297963713090592482}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_GameObject: {fileID: 2297963711468612208}
   m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 8604484703040581089, guid: 2c2b9827a3e1ecf4f9a6c6c818c6fdbe, type: 3}
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fba4c80fe5844664ab053b308fd12a84, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &2297963713168495770
 GameObject:
   m_ObjectHideFlags: 0

Assets/BowArrow/Scenes/GameChallengeScene/校准用的靶子/TargetObject_07.mat

@@ -1,91 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: TargetObject_07
-  m_Shader: {fileID: 10760, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        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}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _BumpScale: 1
-    - _ColorMask: 15
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UVSec: 0
-    - _UseUIAlphaClip: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 0.39215687}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _ReflectColor: {r: 1, g: 1, b: 1, a: 0.5}
-  m_BuildTextureStacks: []

Assets/BowArrow/Scenes/GameChallengeScene/校准用的靶子/TargetObject_07.mat.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: dc465212ebc53bd4486a8c63bedbdbda
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/BowArrow/Scripts/Expand/AutoResetView.cs

@@ -42,6 +42,7 @@ public class AutoResetView : MonoBehaviour
 
     void OnDestroy() {
         if (ins == this) ins = null;
+        ChallengeTargetForResetView.DestroyDelay();
     }
 
     float prepareTime = 3;

Assets/BowArrow/Scripts/Manager/LoginMgr/RegisterView.cs

@@ -36,8 +36,6 @@ public class RegisterView : MonoBehaviour
             GameObject.FindObjectOfType<LoginMgr>().showLoginView();
         };
         agreementPopup.gameObject.SetActive(true);
-        //他们觉得注册时候玩家填写用户名有点麻烦,所以想用户名自动生成
-        GetInputField(registerInUser).text = (JC.CS.Utility.GetTimestamp() / 1000).ToString();
     }
 
     void Start()

Assets/BowArrow/Scripts/View/DeviceCalibrateView.cs

@@ -179,6 +179,10 @@ public class DeviceCalibrateView : MonoBehaviour, MenuBackInterface
         }
         RefreshResetMagBtn();
     }
+    void CancelResetMag() {
+        calibrateMagDoing = false;
+        RefreshResetMagBtn();
+    }
     void UpdateForMag() {
         if (deviceCalibrateItem == DeviceCalibrateItem.Mag) {
             if (!AimHandler.ins.MagCalibrater.Complete) {
@@ -187,14 +191,16 @@ public class DeviceCalibrateView : MonoBehaviour, MenuBackInterface
                 magReset.SetActive(true);
                 //地磁校准超时提示
                 if (calibrateMagDoing && Time.realtimeSinceStartup - calibrateMagStartTime > 20) {
-                    calibrateMagDoing = false;
-                    RefreshResetMagBtn();
+                    CancelResetMag();
                     PopupMgr.ins.ShowTipTop("存在磁场干扰，请远离电子设备后再进行校准！");
                 }
             } else {
                 tipMag1.SetActive(false);
                 tipMag2.SetActive(true);
                 magReset.SetActive(true);
+                if (calibrateMagDoing) {
+                    CancelResetMag();
+                }
             }
         }
     }