From de6f7a7c766c0c9ffc652954ba02e83dd78af192 Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Tue, 15 Dec 2020 16:36:41 +0800
Subject: [PATCH] 增加新手引导适配 删除Loading右上角按钮
---
Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs | 16 ++--
Assets/Resources/UI/Guide/GuidePanel.prefab | 122 ++++++++++++++++++++++++++++++
ProjectSettings/ProjectSettings.asset | 60 +++++++-------
Assets/Scenes/Loading.unity | 4
4 files changed, 161 insertions(+), 41 deletions(-)
diff --git a/Assets/Resources/UI/Guide/GuidePanel.prefab b/Assets/Resources/UI/Guide/GuidePanel.prefab
index 633d781..875ef30 100644
--- a/Assets/Resources/UI/Guide/GuidePanel.prefab
+++ b/Assets/Resources/UI/Guide/GuidePanel.prefab
@@ -231,7 +231,8 @@
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_Children:
+ - {fileID: 6650253152916097481}
m_Father: {fileID: 4438159195928217730}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1024,6 +1025,125 @@
m_OnClick:
m_PersistentCalls:
m_Calls: []
+--- !u!1 &3877913321702056043
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6650253152916097481}
+ - component: {fileID: 3529863359404665673}
+ - component: {fileID: 8479939958163075339}
+ - component: {fileID: 5628354807042106697}
+ m_Layer: 5
+ m_Name: BGPanel
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6650253152916097481
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3877913321702056043}
+ 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: 3396256655537851812}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 0}
+ m_AnchoredPosition: {x: 0, y: -250}
+ m_SizeDelta: {x: 0, y: 500}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3529863359404665673
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3877913321702056043}
+ m_CullTransparentMesh: 0
+--- !u!114 &8479939958163075339
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3877913321702056043}
+ 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: 21300000, guid: 7545f6da4eda5274396e5021d128679d, type: 3}
+ 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!114 &5628354807042106697
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3877913321702056043}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ 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: 8479939958163075339}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
--- !u!1 &4033919787940865614
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Loading.unity b/Assets/Scenes/Loading.unity
index b94f9e8..f14c417 100644
--- a/Assets/Scenes/Loading.unity
+++ b/Assets/Scenes/Loading.unity
@@ -201341,7 +201341,7 @@
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &1826197576
RectTransform:
m_ObjectHideFlags: 0
@@ -235455,7 +235455,7 @@
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &2022232295
RectTransform:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
index 4d5a9a3..523e847 100644
--- a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
+++ b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
@@ -15,8 +15,8 @@
bool isLogining;
private JsonData loginData;
- private Button repairBtn;//修复
- private Button noticeBtn;//公告
+ //private Button repairBtn;//修复
+ //private Button noticeBtn;//公告
private Button startBtn;//开始游戏
private Slider progressSlider;//进度条
@@ -43,7 +43,7 @@
isLogining = false;
- repairBtn = transform.Find("Panel/RepairBtn").GetComponent<Button>();
+ //repairBtn = transform.Find("Panel/RepairBtn").GetComponent<Button>();
startBtn = transform.Find("Panel/StartBtn").GetComponent<Button>();
versionTxt = transform.Find("Panel/Version").GetComponent<Text>();
@@ -55,10 +55,10 @@
startBtn.onClick.AddListener(OnClickLoginBtn);
startBtn.gameObject.SetActive(true);
- repairBtn.onClick.AddListener(() =>
- {
- OnClickResetBtn();
- });
+ // repairBtn.onClick.AddListener(() =>
+ // {
+ // OnClickResetBtn();
+ // });
//transform.Find("Panel/Button (1)").GetComponent<Button>().onClick.AddListener(OnClickResetBtn);
@@ -134,8 +134,8 @@
/// </summary>
void SDKloginNext()
{
- Debug.Log("SDK登录,修改Imei");
GameConfig.Imei = SDKManager.ins.sdk.uid;
+ Debug.Log("SDK登录,修改Imei：" + GameConfig.Imei);
transform.Find("Panel/PlayerID").GetComponent<Text>().text = "玩家ID:" + GameConfig.Imei;
loginNext();
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index f894be1..918a46c 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -316,36 +316,6 @@
m_Height: 36
m_Kind: 0
m_SubKind:
- - m_Textures: []
- m_Width: 432
- m_Height: 432
- m_Kind: 2
- m_SubKind:
- - m_Textures: []
- m_Width: 324
- m_Height: 324
- m_Kind: 2
- m_SubKind:
- - m_Textures: []
- m_Width: 216
- m_Height: 216
- m_Kind: 2
- m_SubKind:
- - m_Textures: []
- m_Width: 162
- m_Height: 162
- m_Kind: 2
- m_SubKind:
- - m_Textures: []
- m_Width: 108
- m_Height: 108
- m_Kind: 2
- m_SubKind:
- - m_Textures: []
- m_Width: 81
- m_Height: 81
- m_Kind: 2
- m_SubKind:
- m_Textures:
- {fileID: 0}
m_Width: 192
@@ -382,6 +352,36 @@
m_Height: 36
m_Kind: 1
m_SubKind:
+ - m_Textures: []
+ m_Width: 432
+ m_Height: 432
+ m_Kind: 2
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 324
+ m_Height: 324
+ m_Kind: 2
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 216
+ m_Height: 216
+ m_Kind: 2
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 162
+ m_Height: 162
+ m_Kind: 2
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 108
+ m_Height: 108
+ m_Kind: 2
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 81
+ m_Height: 81
+ m_Kind: 2
+ m_SubKind:
m_BuildTargetBatching: []
m_BuildTargetGraphicsJobs:
- m_BuildTarget: MacStandaloneSupport
--
Gitblit v1.9.1