From 5005fed9316ff554e2aa847964da8bac92715495 Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Thu, 17 Dec 2020 14:31:39 +0800
Subject: [PATCH] Merge commit 'ecc314323bc050612d47511689b5b4222718fd06'
---
Assets/Prefabs/UI/Endless/FPSText.prefab.meta | 7 +++
Assets/Prefabs/UI/Endless/FPSText.prefab | 95 +++++++++++++++++++++++++++++++++++++++++++++++
Assets/Scripts/Manager/ManagerRoot.cs | 3 +
3 files changed, 104 insertions(+), 1 deletions(-)
diff --git a/Assets/Prefabs/UI/Endless/FPSText.prefab b/Assets/Prefabs/UI/Endless/FPSText.prefab
new file mode 100644
index 0000000..04e8f91
--- /dev/null
+++ b/Assets/Prefabs/UI/Endless/FPSText.prefab
@@ -0,0 +1,95 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2915540906519113776
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2915540906519113777}
+ - component: {fileID: 2915540906519113772}
+ - component: {fileID: 2915540906519113775}
+ - component: {fileID: 2915540906519113774}
+ m_Layer: 5
+ m_Name: FPSText
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &2915540906519113777
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2915540906519113776}
+ 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: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 457, y: 923.6}
+ m_SizeDelta: {x: 200, y: 80}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2915540906519113772
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2915540906519113776}
+ m_CullTransparentMesh: 0
+--- !u!114 &2915540906519113775
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2915540906519113776}
+ 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: 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_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 30
+ m_FontStyle: 1
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 40
+ m_Alignment: 3
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text:
+--- !u!114 &2915540906519113774
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2915540906519113776}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: b60bfbc84f4b10642a259b632bc7d0cd, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ fpsText: {fileID: 2915540906519113775}
diff --git a/Assets/Prefabs/UI/Endless/FPSText.prefab.meta b/Assets/Prefabs/UI/Endless/FPSText.prefab.meta
new file mode 100644
index 0000000..7dba60e
--- /dev/null
+++ b/Assets/Prefabs/UI/Endless/FPSText.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 836294196125bc94cb6c988e99cb5869
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Manager/ManagerRoot.cs b/Assets/Scripts/Manager/ManagerRoot.cs
index 400b5c1..cdee2df 100644
--- a/Assets/Scripts/Manager/ManagerRoot.cs
+++ b/Assets/Scripts/Manager/ManagerRoot.cs
@@ -20,7 +20,8 @@
{
GameConfig.useSDK = false;
}
-
+ Application.targetFrameRate = 60;
+ //Debug.Log("设置了帧数为60");
DOTween.Init(true, true, LogBehaviour.Verbose).SetCapacity(200, 10);
root = new GameObject("ManagerRoot");
--
Gitblit v1.9.1