lvjincheng 3 years ago
parent
commit
ca9fa60e59

+ 9 - 9
Assets/BowArrow/Scenes/Home.unity

@@ -1057,7 +1057,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: 8.8567295, y: 0}
+  m_AnchoredPosition: {x: 8.461538, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &219397737
@@ -3399,8 +3399,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 60, y: -35}
-  m_SizeDelta: {x: 142.11653, y: 20.546968}
+  m_AnchoredPosition: {x: 250, y: -35}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &551154240
 MonoBehaviour:
@@ -8803,7 +8803,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8896251417503616548, guid: 13268d381a624684a9c989604be1571f, type: 3}
       propertyPath: m_RootOrder
-      value: 8
+      value: 7
       objectReference: {fileID: 0}
     - target: {fileID: 8896251417503616548, guid: 13268d381a624684a9c989604be1571f, type: 3}
       propertyPath: m_LocalPosition.x
@@ -10399,7 +10399,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: 96.57018, y: 0}
+  m_AnchoredPosition: {x: 95.38462, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1698308730
@@ -11417,7 +11417,7 @@ Transform:
   - {fileID: 872525752}
   - {fileID: 732909351}
   m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1790634221
 GameObject:
@@ -12898,7 +12898,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!114 &2012199174
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -12974,7 +12974,7 @@ RectTransform:
   - {fileID: 2069336234}
   - {fileID: 551154239}
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -14850,7 +14850,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: 54.182346, y: 0}
+  m_AnchoredPosition: {x: 55.384617, y: 0}
   m_SizeDelta: {x: 0, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &2473343858706513567

+ 5 - 0
Assets/BowArrow/Scripts/Debug/DebugDeviceCMD.cs

@@ -12,7 +12,12 @@ public class DebugDeviceCMD : MonoBehaviour
     int index = 0;
 
     void Awake() {
+        if (ins) {
+            Destroy(this.gameObject);
+            return;
+        }
         ins = this;
+        DontDestroyOnLoad(this.gameObject);
         textGroup = transform.Find("TextGroup");
         textStrList = new string[textGroup.childCount];
         for (int i = 0; i < textStrList.Length; i++) {

+ 1 - 1
Assets/BowArrow/Scripts/Manager/LoginMgr.cs

@@ -30,7 +30,7 @@ public class LoginMgr : MonoBehaviour
     }
 
     public static bool CheckAutoLogin() {
-        return false;
+        return true;
     }
 }
 public class UserInfo {

+ 1 - 1
Assets/BowArrow/Scripts/Network/SocketPlayer.cs

@@ -36,8 +36,8 @@ public class SocketPlayer : JC.SocketIO.SocketIOClient
     public bool openInGameScene;
     //测试阶段,用这个
     public void onLoadForTest(int id, string nickname, int avatarID) {
+        LoginMgr.myUserInfo.id = id;
         if (openInGameScene) {
-            LoginMgr.myUserInfo.id = id;
             LoginMgr.myUserInfo.nickname = nickname;
             LoginMgr.myUserInfo.avatarID = avatarID;
         }

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

@@ -50,7 +50,7 @@ public class DeviceBatteryView : MonoBehaviour
     void RequestBatteryForBow()
     {
         try {
-            if (BluetoothAim.ins.hasData && JC.CS.Utility.GetTimestamp() - BluetoothAim.ins.hasDataTime > 3000) {
+            if (BluetoothAim.ins.hasData && JC.CS.Utility.GetTimestamp() - BluetoothAim.ins.hasDataTime > 5000) {
                 BluetoothAim.ins.RequestBattery();
             }
         } catch (Exception) {}