提交

2025-09-26 18:26:23 +00:00 · 2024-02-04 16:17:39 +08:00
parent f04299219c
commit 04043cc6fc
51 changed files with 20366 additions and 2051 deletions
--- a/JNFrame/Assets/Game/Plugins/App/App.cs
+++ b/JNFrame/Assets/Game/Plugins/App/App.cs
@@ -8,7 +8,7 @@ namespace Game.Plugins.App
        
        public static readonly JNGSocket Socket = new JNGSocket();
        public static readonly JNGSyncFrame Sync = new JNGSyncFrame();
-        public static readonly JAPI Api = new(new JAPIConfig(){BaseURL = "http://192.168.0.120:8080"});
+        public static readonly JAPI Api = new(new JAPIConfig(){BaseURL = "http://127.0.0.1:8080"});
        public static readonly EventDispatcher Event = EventDispatcher.Event;

        public static SystemBase[] System()
--- a/JNFrame/Assets/Game/Plugins/App/JNGSocket.cs
+++ b/JNFrame/Assets/Game/Plugins/App/JNGSocket.cs
@@ -8,7 +8,7 @@ namespace Game.Plugins.App
        protected override async UniTask<string> GetUrl()
        {
            await UniTask.NextFrame();
-            return "ws://192.168.0.120:8080/websocket";
+            return "ws://127.0.0.1:8080/websocket";
        }
    }
 }
--- a/JNFrame/Assets/Game/Plugins/App/JNGSyncFrame.cs
+++ b/JNFrame/Assets/Game/Plugins/App/JNGSyncFrame.cs
@@ -1,4 +1,5 @@
-using Cysharp.Threading.Tasks;
+using System;
+using Cysharp.Threading.Tasks;
 using Plugins.JNGame.Network.Action;
 using Plugins.JNGame.Sync.Frame;
 using UnityEngine;
@@ -16,17 +17,23 @@ namespace Game.Plugins.App
        protected override async UniTask<JNFrameInfos> OnServerData(int start, int end)
        {
            Debug.Log($"OnServerData - {start}");
-            var data = (await App.Api.GetByte($"/sync/frame?start={start}"));
-            if (data is { Length: > 0 })
+            try
            {
-                JNFrameInfos info = JNFrameInfos.Parser.ParseFrom(data);
-                Debug.Log($"OnServerData - {start} 结束");
-                return info;
+                var data = (await App.Api.GetByte($"/sync/frame?start={start}"));
+                if (data is { Length: > 0 })
+                {
+                    JNFrameInfos info = JNFrameInfos.Parser.ParseFrom(data);
+                    Debug.Log($"OnServerData - {start} 结束");
+                    return info;
+                }
            }
-            else
+            catch(Exception e)
            {
-                return new JNFrameInfos();
+                // ignored
+                Debug.LogError(e.Message);
            }
+
+            return new JNFrameInfos();
        }
    }
 }
--- a/JNFrame/Assets/Game/Plugins/App/Sync/JNGSyncFrameEntrust.cs
+++ b/JNFrame/Assets/Game/Plugins/App/Sync/JNGSyncFrameEntrust.cs
@@ -23,7 +23,7 @@ namespace Game.Plugins.App.Sync
                .Where(item => !(item is IJNSyncFrameComponent))
                .Where(item => !(item is Transform))
                .Where(item => !(allow.Contains(item)));
-
+            
            Debug.Log($"{this.NID} 有{Components.Count()}组件不是同步组件 尝试接管同步 请保证被接管的组件有enabled 同时被接管的组件 enabled 禁止修改");
            
            foreach (var component in Components)
--- a/JNFrame/Assets/Game/Plugins/AstarPathfindingProject/ExampleScenes/ExampleScripts/MineBotAnimation.cs
+++ b/JNFrame/Assets/Game/Plugins/AstarPathfindingProject/ExampleScenes/ExampleScripts/MineBotAnimation.cs
@@ -71,6 +71,7 @@ namespace Pathfinding.Examples {

 			// Speed relative to the character size
 			anim.SetFloat("NormalizedSpeed", relVelocity.magnitude / anim.transform.lossyScale.x);
+			anim.Update((float)dt / 1000);
 		}
 	}
 }
--- a/JNFrame/Assets/Game/Plugins/JNGame/Network/JNSocket.cs
+++ b/JNFrame/Assets/Game/Plugins/JNGame/Network/JNSocket.cs
@@ -77,7 +77,7 @@ namespace Plugins.JNGame.Network
        private void Onbinary(WebSocket websocket, byte[] data)
        {
            
-            NSystem.Log($"[JNSocket] Onbinary");
+            // NSystem.Log($"[JNSocket] Onbinary");
            Dispatch(NDataUtil.Parse(data));
            
        }
--- a/JNFrame/Assets/Game/Plugins/JNGame/Sync/Frame/Game/Time.meta
+++ b/JNFrame/Assets/Game/Plugins/JNGame/Sync/Frame/Game/Time.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9606b3aa4a2d4390890ae975ea7567d3
+timeCreated: 1707030980
--- a/JNFrame/Assets/Game/Plugins/JNGame/Sync/Frame/Game/Time/JNFrameTime.cs
+++ b/JNFrame/Assets/Game/Plugins/JNGame/Sync/Frame/Game/Time/JNFrameTime.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Plugins.JNGame.Util;
+
+namespace Plugins.JNGame.Sync.Frame.game.Time
+{
+    
+    
+    public class JNFrameTimeHandler
+    {
+        public int ID;
+        public Action Handler;
+        public int Timeout;
+    }
+    
+    //帧同步定时器
+    public class JNFrameTime : Singleton<JNFrameTime>
+    {
+        
+        private int _id = 0;
+        private List<JNFrameTimeHandler> _handlers = new();
+        
+        //设置定时器
+        public int SetTimeout(Action handler,int timeout = 0)
+        {
+            var funHandler = new JNFrameTimeHandler()
+            {
+                ID = this._id++,
+                Handler = handler,
+                Timeout = timeout
+            };
+            this._handlers.Add(funHandler);
+            return funHandler.ID;
+        }
+
+        public void Update(int dt)
+        {
+            
+            this._handlers.ToList().ForEach(action =>
+            {
+                action.Timeout -= dt;
+                if (action.Timeout <= 0)
+                {
+                    action.Handler();
+                    this._handlers.Remove(action);
+                }
+            });
+            
+        }
+
+    }
+}
--- a/JNFrame/Assets/Game/Plugins/JNGame/Sync/Frame/Game/Time/JNFrameTime.cs.meta
+++ b/JNFrame/Assets/Game/Plugins/JNGame/Sync/Frame/Game/Time/JNFrameTime.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d96b5b6d30384c7482ce18479c06ebfb
+timeCreated: 1707030984
--- a/JNFrame/Assets/Game/Plugins/JNGame/Sync/Frame/JNSyncFrame.cs
+++ b/JNFrame/Assets/Game/Plugins/JNGame/Sync/Frame/JNSyncFrame.cs
@@ -7,6 +7,7 @@ using Cysharp.Threading.Tasks;
 using Google.Protobuf;
 using Plugins.JNGame.Sync.Frame.Entity;
 using Plugins.JNGame.Sync.Frame.game;
+using Plugins.JNGame.Sync.Frame.game.Time;
 using Plugins.JNGame.System;
 using Plugins.JNGame.Util;
 using UnityEngine;
@@ -33,7 +34,7 @@ namespace Plugins.JNGame.Sync.Frame
        //大于多少帧进行快速追帧
        private int _nMaxFrameLoopBan = 18;
        //将服务器帧数进行平分
-        private int _nDivideFrame = 3;
+        private int _nDivideFrame = 2;
        
        public int NSyncTime => _nSyncTime;
        public int NMaxFrameBan => _nMaxFrameBan;
@@ -85,6 +86,10 @@ namespace Plugins.JNGame.Sync.Frame
        int dtTotal = 0;
        //输入更新
        int dtInputTotal = 0;
+        
+        //是否在追帧
+        private Boolean _isLoop = false;
+        public bool IsLoop => _isLoop;

        public JNTime Time => (new JNTime(this));

@@ -122,7 +127,10 @@ namespace Plugins.JNGame.Sync.Frame
            this.dtInputTotal = 0;
            this._isRequestServerData = false;
            
-            Physics.SyncTransforms();
+            //清除定时器
+            SingletonUtil<JNFrameTime>.Clean();
+            
+            // Physics.SyncTransforms();
            EventDispatcher.Event.Dispatch(JNSyncFrameEvent.CREATE);
            
        }
@@ -140,6 +148,7 @@ namespace Plugins.JNGame.Sync.Frame
            
            if(nSyncTime > 0){
                while(nSyncTime != 0 && this.dtTotal > nSyncTime){
+                    this._isLoop = false;
                    this.OnUpdate();
                    this.dtTotal -= nSyncTime;
                    nSyncTime = this.DyTime();
@@ -147,7 +156,9 @@ namespace Plugins.JNGame.Sync.Frame
            }else{
                //追帧运行 保持前端 15 帧 刷新
                long endTime = (new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds()) + 66;
-                while(this.DyTime() == 0 && (new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds()) < endTime){
+                while(this.DyTime() == 0 && (new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds()) < endTime)
+                {
+                    this._isLoop = true;
                    this.OnUpdate();
                }
                dtTotal = 0;
@@ -211,7 +222,7 @@ namespace Plugins.JNGame.Sync.Frame
                inputs[message.NId] = message;
            }

-            Debug.Log(inputs.Count);
+            // Debug.Log(inputs.Count);
            
            //运行之前帧
            this._nSyncActors.ToList().ForEach(child =>
@@ -243,9 +254,11 @@ namespace Plugins.JNGame.Sync.Frame
                }
            });
            
-            //执行下一帧物理
-            Physics.Simulate((float)dt / 1000);
-            Physics.SyncTransforms();
+            //执行定时器
+            SingletonUtil<JNFrameTime>.Instance.Update(dt);
+            // //执行下一帧物理
+            // Physics.Simulate((float)dt / 1000);
+            // Physics.SyncTransforms();
            

        }
--- a/JNFrame/Assets/Game/Plugins/JNGame/Util/Singleton.cs
+++ b/JNFrame/Assets/Game/Plugins/JNGame/Util/Singleton.cs
@@ -15,7 +15,8 @@

        public static void Clean()
        {
-            Singleton<T>.ins.Clean();
+            if(Singleton<T>.ins != null)
+                Singleton<T>.ins.Clean();
            Singleton<T>.ins = null;
        }

--- a/JNFrame/Assets/Game/Scenes/Mode/Example3_Recast_Navmesh1/Bot.prefab
+++ b/JNFrame/Assets/Game/Scenes/Mode/Example3_Recast_Navmesh1/Bot.prefab
@@ -11,12 +11,12 @@ GameObject:
  - component: {fileID: 4954587615955870202}
  - component: {fileID: 860618204808115368}
  - component: {fileID: 5015953210996162854}
-  - component: {fileID: 2351950405008071142}
  - component: {fileID: 547514512587057512}
  - component: {fileID: 6805233412966097210}
  - component: {fileID: 1147615059965528429}
  - component: {fileID: 4780769471509017217}
  - component: {fileID: 345950735762528131}
+  - component: {fileID: 8400891744945266613}
  m_Layer: 8
  m_Name: Bot
  m_TagString: Untagged
@@ -54,7 +54,8 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  _nId: 0
  isSyncInitSuccess: 0
-  allow: []
+  allow:
+  - {fileID: 6805233412966097210}
 --- !u!114 &5015953210996162854
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -85,50 +86,6 @@ MonoBehaviour:
  tagPenalties: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
  graphMask:
    value: -1
--- !u!114 &2351950405008071142
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 505715710780844734}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f6eb1402c17e84a9282a7f0f62eb584f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _nId: 0
-  isSyncInitSuccess: 0
-  version: 5
-  radius: 0.35
-  height: 0.87
-  canMove: 1
-  maxSpeed: 4
-  gravity: {x: NaN, y: NaN, z: NaN}
-  groundMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  centerOffsetCompatibility: NaN
-  repathRateCompatibility: 0.2
-  canSearchCompability: 1
-  orientation: 0
-  enableRotation: 1
-  autoRepath:
-    mode: 2
-    period: 0.2
-    sensitivity: 10
-    maximumPeriod: 1
-    visualizeSensitivity: 0
-  targetCompatibility: {fileID: 0}
-  maxAcceleration: -2.5
-  rotationSpeed: 540
-  slowdownDistance: 0.6
-  pickNextWaypointDist: 1.5
-  endReachedDistance: 0.05
-  alwaysDrawGizmos: 0
-  slowWhenNotFacingTarget: 1
-  whenCloseToDestination: 0
-  constrainInsideGraph: 0
 --- !u!114 &547514512587057512
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -221,6 +178,52 @@ MonoBehaviour:
  _nId: 0
  isSyncInitSuccess: 0
  key: 0
+  isRobot: 0
+  target: {x: 0, y: 0, z: 0}
+--- !u!114 &8400891744945266613
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 505715710780844734}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 459952d6a3efe0145b231a636579f95c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _nId: 0
+  isSyncInitSuccess: 0
+  version: 5
+  radius: 0.35
+  height: 0.87
+  canMove: 1
+  maxSpeed: 5
+  gravity: {x: NaN, y: NaN, z: NaN}
+  groundMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  centerOffsetCompatibility: NaN
+  repathRateCompatibility: NaN
+  canSearchCompability: 0
+  orientation: 0
+  enableRotation: 1
+  autoRepath:
+    mode: 2
+    period: 0.5
+    sensitivity: 10
+    maximumPeriod: 2
+    visualizeSensitivity: 0
+  targetCompatibility: {fileID: 0}
+  maxAcceleration: -2.5
+  rotationSpeed: 360
+  slowdownDistance: 0.6
+  pickNextWaypointDist: 2
+  endReachedDistance: 0.2
+  alwaysDrawGizmos: 0
+  slowWhenNotFacingTarget: 1
+  whenCloseToDestination: 0
+  constrainInsideGraph: 0
 --- !u!1001 &3512763435436934207
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -324,8 +327,31 @@ PrefabInstance:
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 2402233671515968589, guid: 0b9c68ddd67ee5b9e8aeca86ac0fbc03, type: 3}
+      insertIndex: 1
+      addedObject: {fileID: 8507333172764042117}
  m_SourcePrefab: {fileID: 100100000, guid: 0b9c68ddd67ee5b9e8aeca86ac0fbc03, type: 3}
+--- !u!1 &1290744670267248754 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2402233671515968589, guid: 0b9c68ddd67ee5b9e8aeca86ac0fbc03, type: 3}
+  m_PrefabInstance: {fileID: 3512763435436934207}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &8507333172764042117
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1290744670267248754}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 32f8b8b7207b1a24ea68368f6a1a91b9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _nId: 0
+  isSyncInitSuccess: 0
+  allow: []
 --- !u!4 &1290744670267477074 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 2402233671516325997, guid: 0b9c68ddd67ee5b9e8aeca86ac0fbc03, type: 3}
--- a/JNFrame/Assets/Game/Scenes/Mode/Example3_Recast_Navmesh1/WorldSync01.unity
+++ b/JNFrame/Assets/Game/Scenes/Mode/Example3_Recast_Navmesh1/WorldSync01.unity
@@ -116,7 +116,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &12
 GameObject:
@@ -135,7 +135,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &13
 GameObject:
@@ -154,7 +154,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &14
 GameObject:
@@ -173,7 +173,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &15
 GameObject:
@@ -192,7 +192,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &16
 GameObject:
@@ -211,7 +211,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &17
 GameObject:
@@ -230,7 +230,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &18
 GameObject:
@@ -249,7 +249,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &19
 GameObject:
@@ -268,7 +268,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &20
 GameObject:
@@ -287,7 +287,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &21
 GameObject:
@@ -306,7 +306,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &22
 GameObject:
@@ -325,7 +325,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &23
 GameObject:
@@ -344,7 +344,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &24
 GameObject:
@@ -363,7 +363,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &25
 GameObject:
@@ -382,7 +382,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &26
 GameObject:
@@ -401,7 +401,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &27
 GameObject:
@@ -420,7 +420,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &28
 GameObject:
@@ -439,7 +439,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &29
 GameObject:
@@ -458,7 +458,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &30
 GameObject:
@@ -477,7 +477,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &31
 GameObject:
@@ -496,7 +496,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &32
 GameObject:
@@ -515,7 +515,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &33
 GameObject:
@@ -534,7 +534,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &34
 GameObject:
@@ -553,7 +553,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &35
 GameObject:
@@ -572,7 +572,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &36
 GameObject:
@@ -591,7 +591,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &37
 GameObject:
@@ -610,7 +610,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &38
 GameObject:
@@ -629,7 +629,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &39
 GameObject:
@@ -648,7 +648,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &40
 GameObject:
@@ -667,7 +667,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &41
 GameObject:
@@ -686,7 +686,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &42
 GameObject:
@@ -705,7 +705,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &43
 GameObject:
@@ -724,7 +724,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &44
 GameObject:
@@ -743,7 +743,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &45
 GameObject:
@@ -794,7 +794,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &48
 GameObject:
@@ -813,7 +813,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &49
 GameObject:
@@ -832,7 +832,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &50
 GameObject:
@@ -851,7 +851,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &51
 GameObject:
@@ -870,7 +870,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &52
 GameObject:
@@ -889,7 +889,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &53
 GameObject:
@@ -908,7 +908,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &54
 GameObject:
@@ -927,7 +927,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &55
 GameObject:
@@ -946,7 +946,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &56
 GameObject:
@@ -965,7 +965,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &57
 GameObject:
@@ -984,7 +984,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &58
 GameObject:
@@ -1003,7 +1003,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &59
 GameObject:
@@ -1022,7 +1022,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &60
 GameObject:
@@ -1041,7 +1041,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &61
 GameObject:
@@ -1060,7 +1060,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &62
 GameObject:
@@ -1079,7 +1079,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &63
 GameObject:
@@ -1098,7 +1098,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &64
 GameObject:
@@ -1117,7 +1117,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &65
 GameObject:
@@ -1136,7 +1136,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &66
 GameObject:
@@ -1155,7 +1155,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &67
 GameObject:
@@ -1174,7 +1174,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &68
 GameObject:
@@ -1193,7 +1193,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &69
 GameObject:
@@ -1212,7 +1212,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &70
 GameObject:
@@ -1231,7 +1231,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &71
 GameObject:
@@ -1250,7 +1250,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &72
 GameObject:
@@ -1269,7 +1269,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &73
 GameObject:
@@ -1288,7 +1288,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &74
 GameObject:
@@ -1307,7 +1307,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &75
 GameObject:
@@ -1326,7 +1326,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &76
 GameObject:
@@ -1345,7 +1345,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &77
 GameObject:
@@ -1364,7 +1364,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &78
 GameObject:
@@ -1383,7 +1383,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &79
 GameObject:
@@ -1402,7 +1402,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &80
 GameObject:
@@ -1421,7 +1421,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &81
 GameObject:
@@ -1440,7 +1440,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &82
 GameObject:
@@ -1459,7 +1459,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &83
 GameObject:
@@ -1478,7 +1478,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &84
 GameObject:
@@ -1497,7 +1497,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &85
 GameObject:
@@ -1516,7 +1516,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &86
 GameObject:
@@ -1535,7 +1535,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &87
 GameObject:
@@ -1554,7 +1554,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &88
 GameObject:
@@ -1573,7 +1573,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &89
 GameObject:
@@ -1592,7 +1592,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &109
 GameObject:
@@ -1611,7 +1611,7 @@ GameObject:
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 4294967295
+  m_StaticEditorFlags: 0
  m_IsActive: 1
 --- !u!1 &110
 GameObject:
@@ -1797,7 +1797,7 @@ Transform:
  m_GameObject: {fileID: 19}
  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 7.79195, y: 30.101498, z: -27.93608}
+  m_LocalPosition: {x: 7.79195, y: 30.3, z: -27.93608}
  m_LocalScale: {x: 3, y: 2, z: 3}
  m_ConstrainProportionsScale: 0
  m_Children: []
@@ -8686,7 +8686,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 78396926cbbfc4ac3b48fc5fc34a87d1, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  _nId: 5
+  _nId: 0
  isSyncInitSuccess: 0
  version: 1
  data:
@@ -8865,55 +8865,6 @@ LightingSettings:
  m_PVRTiledBaking: 0
  m_NumRaysToShootPerTexel: -1
  m_RespectSceneVisibilityWhenBakingGI: 0
--- !u!1 &467558785
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 467558787}
-  - component: {fileID: 467558786}
-  m_Layer: 0
-  m_Name: UI
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &467558786
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 467558785}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e61b94b311b605b4195e022f5370e558, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  mode: {fileID: 855056720}
-  cam: {fileID: 502858440}
-  mask:
-    serializedVersion: 2
-    m_Bits: 1
--- !u!4 &467558787
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 467558785}
-  serializedVersion: 2
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &502858437
 GameObject:
  m_ObjectHideFlags: 0
@@ -9096,4 +9047,3 @@ SceneRoots:
  m_ObjectHideFlags: 0
  m_Roots:
  - {fileID: 855056719}
-  - {fileID: 467558787}
--- a/JNFrame/Assets/Game/Scenes/UIScene.unity
+++ b/JNFrame/Assets/Game/Scenes/UIScene.unity
@@ -104,7 +104,7 @@ NavMeshSettings:
  serializedVersion: 2
  m_ObjectHideFlags: 0
  m_BuildSettings:
-    serializedVersion: 2
+    serializedVersion: 3
    agentTypeID: 0
    agentRadius: 0.5
    agentHeight: 2
@@ -117,12 +117,145 @@ NavMeshSettings:
    cellSize: 0.16666667
    manualTileSize: 0
    tileSize: 256
-    accuratePlacement: 0
+    buildHeightMesh: 0
    maxJobWorkers: 0
    preserveTilesOutsideBounds: 0
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
+--- !u!1 &81288984
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 81288985}
+  - component: {fileID: 81288988}
+  - component: {fileID: 81288987}
+  - component: {fileID: 81288986}
+  m_Layer: 5
+  m_Name: Button (Legacy) (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &81288985
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 81288984}
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1291200674}
+  m_Father: {fileID: 878636056}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 225, y: 104}
+  m_SizeDelta: {x: 180, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &81288986
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 81288984}
+  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: 81288987}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1911778723}
+        m_TargetAssemblyTypeName: GWorldSync01UI, Assembly-CSharp
+        m_MethodName: OnClickJoinGame
+        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 &81288987
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 81288984}
+  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 &81288988
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 81288984}
+  m_CullTransparentMesh: 1
 --- !u!1 &121702108
 GameObject:
  m_ObjectHideFlags: 0
@@ -154,7 +287,6 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 2008468464}
-  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
@@ -234,7 +366,6 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 878636056}
-  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 1, y: 1}
@@ -359,7 +490,9 @@ Canvas:
  m_OverrideSorting: 0
  m_OverridePixelPerfect: 0
  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
  m_SortingLayerID: 0
  m_SortingOrder: 0
  m_TargetDisplay: 0
@@ -375,10 +508,12 @@ RectTransform:
  m_LocalScale: {x: 0, y: 0, z: 0}
  m_ConstrainProportionsScale: 0
  m_Children:
+  - {fileID: 1039426510}
  - {fileID: 2008468464}
+  - {fileID: 81288985}
+  - {fileID: 1188520222}
  - {fileID: 178957020}
  m_Father: {fileID: 1911778722}
-  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@@ -416,9 +551,17 @@ Camera:
  m_projectionMatrixMode: 1
  m_GateFitMode: 2
  m_FOVAxisMode: 0
+  m_Iso: 200
+  m_ShutterSpeed: 0.005
+  m_Aperture: 16
+  m_FocusDistance: 10
+  m_FocalLength: 50
+  m_BladeCount: 5
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
+  m_Anamorphism: 0
  m_SensorSize: {x: 36, y: 24}
  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
  m_NormalizedViewPortRect:
    serializedVersion: 2
    x: 0
@@ -458,7 +601,6 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 1911778722}
-  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}
@@ -525,14 +667,437 @@ Transform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1035522521}
+  serializedVersion: 2
  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_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 1911778722}
-  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1039426509
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1039426510}
+  - component: {fileID: 1039426513}
+  - component: {fileID: 1039426512}
+  - component: {fileID: 1039426511}
+  m_Layer: 5
+  m_Name: Button (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1039426510
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1039426509}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 878636056}
+  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 &1039426511
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1039426509}
+  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: 0
+  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: 1039426512}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1911778723}
+        m_TargetAssemblyTypeName: GWorldSync01UI, Assembly-CSharp
+        m_MethodName: OnClickScene
+        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 &1039426512
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1039426509}
+  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: 0}
+  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 &1039426513
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1039426509}
+  m_CullTransparentMesh: 1
+--- !u!1 &1188520221
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1188520222}
+  - component: {fileID: 1188520225}
+  - component: {fileID: 1188520224}
+  - component: {fileID: 1188520223}
+  m_Layer: 5
+  m_Name: Button (Legacy) (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1188520222
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1188520221}
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1282136035}
+  m_Father: {fileID: 878636056}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -234, y: 104}
+  m_SizeDelta: {x: 180, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1188520223
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1188520221}
+  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: 1188520224}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1911778723}
+        m_TargetAssemblyTypeName: GWorldSync01UI, Assembly-CSharp
+        m_MethodName: OnClickJoinRobot
+        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 &1188520224
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1188520221}
+  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 &1188520225
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1188520221}
+  m_CullTransparentMesh: 1
+--- !u!1 &1282136034
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1282136035}
+  - component: {fileID: 1282136037}
+  - component: {fileID: 1282136036}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1282136035
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1282136034}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1188520222}
+  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 &1282136036
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1282136034}
+  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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 26
+    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: "\u6DFB\u52A0\u4EBA\u673A"
+--- !u!222 &1282136037
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1282136034}
+  m_CullTransparentMesh: 1
+--- !u!1 &1291200673
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1291200674}
+  - component: {fileID: 1291200676}
+  - component: {fileID: 1291200675}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1291200674
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1291200673}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 81288985}
+  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 &1291200675
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1291200673}
+  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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 26
+    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: "\u52A0\u5165\u6E38\u620F"
+--- !u!222 &1291200676
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1291200673}
+  m_CullTransparentMesh: 1
 --- !u!1 &1911778720
 GameObject:
  m_ObjectHideFlags: 0
@@ -543,6 +1108,7 @@ GameObject:
  m_Component:
  - component: {fileID: 1911778722}
  - component: {fileID: 1911778721}
+  - component: {fileID: 1911778723}
  m_Layer: 0
  m_Name: UIScene
  m_TagString: Untagged
@@ -570,6 +1136,7 @@ Transform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1911778720}
+  serializedVersion: 2
  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}
@@ -579,8 +1146,23 @@ Transform:
  - {fileID: 923265421}
  - {fileID: 1035522524}
  m_Father: {fileID: 0}
-  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1911778723
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1911778720}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e61b94b311b605b4195e022f5370e558, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mask:
+    serializedVersion: 2
+    m_Bits: 1
+  playerId: 0
 --- !u!1 &2008468463
 GameObject:
  m_ObjectHideFlags: 0
@@ -614,7 +1196,6 @@ RectTransform:
  m_Children:
  - {fileID: 121702109}
  m_Father: {fileID: 878636056}
-  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
@@ -715,3 +1296,8 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2008468463}
  m_CullTransparentMesh: 1
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 1911778722}
--- a/JNFrame/Assets/Game/Script/battle/GBaseMode.cs
+++ b/JNFrame/Assets/Game/Script/battle/GBaseMode.cs
@@ -4,7 +4,12 @@ namespace Script.battle
 {
    public abstract class GBaseMode<T> : JNGSyncFrame<T>
    {
-        
+        public override void OnSyncLoad()
+        {
+            base.OnSyncLoad();
+            GBattleModeManager.Instance.root = this;
+        }
+
        public override void OnSyncUpdate(int dt, JNFrameInfo frame, T input)
        {
            
@@ -14,5 +19,6 @@ namespace Script.battle
        {
            
        }
+        
    }
 }
--- a/JNFrame/Assets/Game/Script/battle/GBattleModeManager.cs
+++ b/JNFrame/Assets/Game/Script/battle/GBattleModeManager.cs
@@ -31,13 +31,20 @@ namespace Script.battle
        //当前模式
        private GBattleMode _current = GBattleMode.Not;
        
+        //当前模式实体
+        public Object root;
+        
+        //获取当前模式
+        public T GetMode<T>() where T : class
+        {
+            return root as T;
+        }
+        
        //初始化管理器
        public void Init(GBattleModeInfo info)
        {
-            
            // App.Event.AddListener(JNSyncFrameEvent.CREATE,LoadScene);
            // App.Event.AddListener(JNSyncFrameEvent.CLEAR,UnloadScene);
-            
        }
    
        //打开指定模式
--- a/JNFrame/Assets/Game/Script/battle/mode/GWorldSceneMode.cs
+++ b/JNFrame/Assets/Game/Script/battle/mode/GWorldSceneMode.cs
@@ -16,7 +16,8 @@ namespace Script.battle.mode

        public override void OnSyncLoad()
        {
-
+            
+            base.OnSyncLoad();
            Physics = new();
            // BufferPool pool = new BufferPool();
            // Simulation.Create(pool, new DemoNarrowPhaseCallbacks(), new DemoPoseIntegratorCallbacks(new System.Numerics.Vector3(0, -10, 0)), new PositionFirstTimestepper());
--- a/JNFrame/Assets/Game/Script/battle/mode/GWorldSync01Mode.cs
+++ b/JNFrame/Assets/Game/Script/battle/mode/GWorldSync01Mode.cs
@@ -10,7 +10,8 @@ namespace Game.Script.battle.mode
        //控制玩家的唯一标识
        public long Key;
        public Boolean IsAdd;   //是否加入游戏
-        
+        public Boolean IsRobot; //是否是人机
+
    }
    public class GWorldSync01Mode : GBaseMode<GWorldSync01ModeInput>
    {
@@ -27,6 +28,7 @@ namespace Game.Script.battle.mode
                //加入一个玩家
                var player1 = Instantiate(this.player, this.transform);
                player1.GetComponent<PlayerBot>().key = input.Key;
+                player1.GetComponent<PlayerBot>().isRobot = input.IsRobot;
            }
        }
        
--- a/JNFrame/Assets/Game/Script/battle/mode/GWorldSync01ModeScript/GWorldSync01UI.cs
+++ b/JNFrame/Assets/Game/Script/battle/mode/GWorldSync01ModeScript/GWorldSync01UI.cs
@@ -2,34 +2,57 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using Game.Plugins.App;
 using Game.Script.battle.mode;
 using Game.Script.battle.mode.GWorldSync01ModeScript;
+using Script.battle;
 using UnityEngine;

 public class GWorldSync01UI : MonoBehaviour
 {

-    public GWorldSync01Mode mode;
-    
-    //玩家所属的Id
-    private long playerId;
-        
-    public Camera cam;
+    // public Camera cam;
    public LayerMask mask;
-
-    private void Start()
+    
+    //获取模式
+    private GWorldSync01Mode Mode => GBattleModeManager.Instance.GetMode<GWorldSync01Mode>();
+    
+    //获取相机
+    private Camera Cam => (Mode != null ? Mode.GetComponentInChildren<Camera>() : null);
+    
+    //当前控制的玩家
+    public long playerId = 0;
+    
+    //添加玩家
+    public void AddPlayer(Boolean isRobot = false)
    {
-        playerId = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
        //添加玩家
-        mode.NInput.Key = this.playerId;
-        mode.NInput.IsAdd = true;
+        Mode.NInput.Key = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+        Mode.NInput.IsAdd = true;
+        Mode.NInput.IsRobot = isRobot;
+        if (!isRobot)
+        {
+            playerId = Mode.NInput.Key;
+        }
    }
    
-    
-    //控制玩家
-    public void Update()
+    //点击加入人机
+    public void OnClickJoinRobot()
    {
-        var players = mode.GetComponentsInChildren<PlayerBot>();
+        this.AddPlayer(true);
+    }
+    
+    //点击加入游戏
+    public void OnClickJoinGame()
+    {
+        this.AddPlayer();
+    }
+    
+    //点击场景
+    public void OnClickScene()
+    {
+        
+        var players = Mode.GetComponentsInChildren<PlayerBot>();
        
        foreach (var playerBot in players.Where(item => item.key == playerId))
        {
@@ -38,7 +61,7 @@ public class GWorldSync01UI : MonoBehaviour
            bool positionFound = false;
        
            RaycastHit hit;
-            if (cam.pixelRect.Contains(Input.mousePosition) && Physics.Raycast(cam.ScreenPointToRay(Input.mousePosition), out hit, Mathf.Infinity, mask)) {
+            if (Cam.pixelRect.Contains(Input.mousePosition) && Physics.Raycast(Cam.ScreenPointToRay(Input.mousePosition), out hit, Mathf.Infinity, mask)) {
                newPosition = hit.point;
                positionFound = true;
            }
@@ -56,6 +79,11 @@ public class GWorldSync01UI : MonoBehaviour
            }
            
        }
-        
+    }
+
+    private void Update()
+    {
+        if(this.Cam != null)
+            this.Cam.enabled = !App.Sync.IsLoop;
    }
 }
--- a/JNFrame/Assets/Game/Script/battle/mode/GWorldSync01ModeScript/PlayerBot.cs
+++ b/JNFrame/Assets/Game/Script/battle/mode/GWorldSync01ModeScript/PlayerBot.cs
@@ -4,6 +4,8 @@ using Game.Plugins.App.Sync;
 using Pathfinding;
 using UnityEngine;
 using Game.Script.battle.mode;
+using Plugins.JNGame.Sync.Frame.game.Time;
+using Plugins.JNGame.Util;

 namespace Game.Script.battle.mode.GWorldSync01ModeScript
 {
@@ -21,16 +23,25 @@ namespace Game.Script.battle.mode.GWorldSync01ModeScript
        //移动控制
        private AIDestinationSetter move;
        public long key;
+        public Boolean isRobot = false;
+        public Vector3 target;

        public override void OnSyncLoad()
        {
            base.OnSyncLoad();
            this.move = this.GetComponent<AIDestinationSetter>();
+            //一秒中自动寻路
+            SingletonUtil<JNFrameTime>.Instance.SetTimeout(() =>
+            {
+                if(this.isRobot)
+                    this.SetTarget(new Vector3(GetSync().nRandomInt(-30,50),1,GetSync().nRandomInt(-60,20)));
+            },1000);
        }

        //设置目标位置
        public void SetTarget(Vector3 pos)
        {
+            this.target = pos;
            this.move.SetTarget(pos);
        }

@@ -42,6 +53,7 @@ namespace Game.Script.battle.mode.GWorldSync01ModeScript
                //设置位置
                this.SetTarget(new Vector3(input.x,input.y,input.z));
            }
+            
        }


--- a/JNFrame/Assets/Game/Script/battle/mode/GWorldSync01ModeScript/PlayerBotAIPath.cs
+++ b/JNFrame/Assets/Game/Script/battle/mode/GWorldSync01ModeScript/PlayerBotAIPath.cs
@@ -0,0 +1,20 @@
+using System.Collections;
+using System.Collections.Generic;
+using Game.Script.battle.mode.GWorldSync01ModeScript;
+using Pathfinding;
+using UnityEngine;
+
+public class PlayerBotAIPath : AIPath
+{
+    public override void OnTargetReached()
+    {
+        
+        base.OnTargetReached();
+        //如果寻路结束 自己是AI 则 随机寻路
+        if (this.GetComponent<PlayerBot>().isRobot)
+        {
+            this.GetComponent<PlayerBot>().SetTarget(new Vector3(GetSync().nRandomInt(-30,50),1,GetSync().nRandomInt(-60,20)));
+        }
+        
+    }
+}
--- a/JNFrame/Assets/Game/Script/battle/mode/GWorldSync01ModeScript/PlayerBotAIPath.cs.meta
+++ b/JNFrame/Assets/Game/Script/battle/mode/GWorldSync01ModeScript/PlayerBotAIPath.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 459952d6a3efe0145b231a636579f95c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/JNFrame/Assets/StreamingAssets/build_info
+++ b/JNFrame/Assets/StreamingAssets/build_info
@@ -1 +1 @@
-Build from PC-20230316NUNE at 2024/2/2 18:06:59
+Build from PC-20230316NUNE at 2024/2/4 16:16:41