diff --git a/Assets/LuaFramework/Scripts/Manager/ConfigManager.cs b/Assets/LuaFramework/Scripts/Manager/ConfigManager.cs
index 8a5afba6e4..e2d3c5cde1 100644
--- a/Assets/LuaFramework/Scripts/Manager/ConfigManager.cs
+++ b/Assets/LuaFramework/Scripts/Manager/ConfigManager.cs
@@ -188,5 +188,39 @@ namespace GameLogic
string v = NetInfo.GetInfo(key);
return v;
}
+
+
+ // 判断设置是否激活
+ public Boolean IsSettingActive(string settingType)
+ {
+ string s_isActive = "Setting." + settingType + ".isActive";
+ string s_versionCode = "Setting." + settingType + ".versionCode";
+ string isActive = this.GetConfigInfo(s_isActive);
+ if (isActive != null && isActive.Equals("1"))
+ {
+ if (!AppConst.isSDK)
+ {
+ return true;
+ }
+ int vc = AndroidDeviceInfo.Instance.GetVersionCode();
+ if (vc >= Convert.ToInt32(this.GetConfigInfo(s_versionCode)))
+ {
+ //符合包版本
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public string GetSettingValue(string settingType)
+ {
+ if (this.IsSettingActive(settingType))
+ {
+ string s_value = "Setting." + settingType + ".value";
+ string value = this.GetConfigInfo(s_value);
+ return value;
+ }
+ return null;
+ }
}
}
diff --git a/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab b/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab
index 67c72708a6..33a3c948f6 100644
--- a/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab
+++ b/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab
@@ -185,6 +185,8 @@ RectTransform:
m_Children:
- {fileID: 224288439046397624}
- {fileID: 224037671506906218}
+ - {fileID: 7592808747051568684}
+ - {fileID: 4077618250820233377}
m_Father: {fileID: 224438504143917514}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1112,7 +1114,15 @@ MonoBehaviour:
buttonC: {fileID: 114770460945833606}
buttonCText: {fileID: 6325924177525393116}
msg: {fileID: 3905417867144736648}
+ proto: {fileID: 2029342841453864802}
+ grant: {fileID: 7376968313563432897}
title: {fileID: 8945895205730066828}
+ protoButton:
+ - {fileID: 5495656929645836468}
+ - {fileID: 346886743416019799}
+ privateButton:
+ - {fileID: 1340546768720825739}
+ - {fileID: 5016750666297025432}
--- !u!1 &1506183757600774
GameObject:
m_ObjectHideFlags: 0
@@ -2046,6 +2056,417 @@ MonoBehaviour:
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
+--- !u!1 &350792850229015469
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3047544484574874014}
+ - component: {fileID: 2179749942674778040}
+ - component: {fileID: 6492977128126809903}
+ - component: {fileID: 7411331836077809485}
+ m_Layer: 5
+ m_Name: Viewport
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3047544484574874014
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 350792850229015469}
+ 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:
+ - {fileID: 7122593223438226224}
+ m_Father: {fileID: 5880767674647597976}
+ m_RootOrder: 0
+ 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, y: 1}
+--- !u!114 &2179749942674778040
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 350792850229015469}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_ShowMaskGraphic: 0
+--- !u!222 &6492977128126809903
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 350792850229015469}
+ m_CullTransparentMesh: 0
+--- !u!114 &7411331836077809485
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 350792850229015469}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 10917, 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
+--- !u!1 &523974784824859599
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7802775192081720858}
+ - component: {fileID: 7633093121208577553}
+ - component: {fileID: 6865046408653882514}
+ - component: {fileID: 1340546768720825739}
+ m_Layer: 5
+ m_Name: private1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7802775192081720858
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 523974784824859599}
+ 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:
+ - {fileID: 3111124380791190687}
+ - {fileID: 5367051288385633483}
+ - {fileID: 2035327872646395778}
+ m_Father: {fileID: 7592808747051568684}
+ m_RootOrder: 2
+ 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: -254.4, y: 68}
+ m_SizeDelta: {x: 236, y: 40.7}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7633093121208577553
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 523974784824859599}
+ m_CullTransparentMesh: 0
+--- !u!114 &6865046408653882514
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 523974784824859599}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 0}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ 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
+--- !u!114 &1340546768720825739
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 523974784824859599}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, 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: 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_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_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 6865046408653882514}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+--- !u!1 &1552618035734974640
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4662618145885411357}
+ - component: {fileID: 8159636752788822114}
+ - component: {fileID: 5040880754174225477}
+ - component: {fileID: 346886743416019799}
+ m_Layer: 5
+ m_Name: proto2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4662618145885411357
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1552618035734974640}
+ 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:
+ - {fileID: 733935362602501219}
+ m_Father: {fileID: 7592808747051568684}
+ 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}
+ m_AnchoredPosition: {x: -194, y: -112}
+ m_SizeDelta: {x: 275.2, y: 40.7}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8159636752788822114
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1552618035734974640}
+ m_CullTransparentMesh: 0
+--- !u!114 &5040880754174225477
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1552618035734974640}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 0}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ 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
+--- !u!114 &346886743416019799
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1552618035734974640}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, 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: 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_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_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 5040880754174225477}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+--- !u!1 &2029342841453864802
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7592808747051568684}
+ - component: {fileID: 5188211614695415878}
+ - component: {fileID: 7511417068405564286}
+ m_Layer: 5
+ m_Name: proto
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &7592808747051568684
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2029342841453864802}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1.0000799, y: 1.0000799, z: 1.0000799}
+ m_Children:
+ - {fileID: 4989184049301841463}
+ - {fileID: 4662618145885411357}
+ - {fileID: 7802775192081720858}
+ - {fileID: 5166895380907273883}
+ m_Father: {fileID: 224278165673533222}
+ m_RootOrder: 2
+ 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: 0.70233154, y: 27.704468}
+ m_SizeDelta: {x: 766, y: 407.1}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5188211614695415878
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2029342841453864802}
+ m_CullTransparentMesh: 0
+--- !u!114 &7511417068405564286
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2029342841453864802}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 39
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 50
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u5728\u60A8\u4F7F\u7528\u6211\u4EEC\uFF08\u7315\u7334\u6843\uFF09\u7684\u670D\u52A1\u524D\uFF0C\u8BF7\u60A8\u52A1\u5FC5\u5BA1\u614E\u9605\u8BFB\u3001\u5145\u5206\u7406\u89E3\u7315\u7334\u6843\u7528\u6237\u534F\u8BAE\u548C\u7315\u7334\u6843\u9690\u79C1\u653F\u7B56\u7684\u5404\u6761\u6B3E\u3002\u540C\u65F6\uFF0C\u60A8\u5E94\u7279\u522B\u6CE8\u610F\u524D\u8FF0\u534F\u8BAE\u4E2D\u514D\u9664\u6216\u8005\u9650\u5236\u6211\u4EEC\u8D23\u4EFB\u7684\u6761\u6B3E\u3001\u5BF9\u60A8\u6743\u5229\u8FDB\u884C\u9650\u5236\u7684\u3001\u7EA6\u5B9A\u4E89\u8BAE\u89E3\u51B3\u65B9\u5F0F\u548C\u53F8\u6CD5\u7BA1\u8F96\u7684\u6761\u6B3E\u3002\u5982\u60A8\u5DF2\u7ECF\u8BE6\u7EC6\u9605\u8BFB\u5E76\u540C\u610F\u7315\u7334\u6843\u7528\u6237\u534F\u8BAE\u548C\u7315\u7334\u6843\u9690\u79C1\u653F\u7B56\uFF0C\u8BF7\u70B9\u51FB\u201C\u540C\u610F\u201D\u5F00\u59CB\u4F7F\u7528\u6211\u4EEC\u7684\u670D\u52A1\u3002"
+ LanguageIndex: 11147
--- !u!1 &2561396488963143309
GameObject:
m_ObjectHideFlags: 0
@@ -2187,6 +2608,198 @@ Canvas:
m_SortingLayerID: 0
m_SortingOrder: -200
m_TargetDisplay: 0
+--- !u!1 &3266828147510336599
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4989184049301841463}
+ - component: {fileID: 2031912727090151785}
+ - component: {fileID: 3782830762530834415}
+ - component: {fileID: 5495656929645836468}
+ m_Layer: 5
+ m_Name: proto1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4989184049301841463
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3266828147510336599}
+ 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:
+ - {fileID: 5577629481923578102}
+ m_Father: {fileID: 7592808747051568684}
+ 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: 155.4, y: 112.9}
+ m_SizeDelta: {x: 275.2, y: 40.7}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2031912727090151785
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3266828147510336599}
+ m_CullTransparentMesh: 0
+--- !u!114 &3782830762530834415
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3266828147510336599}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 0}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ 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
+--- !u!114 &5495656929645836468
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3266828147510336599}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, 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: 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_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_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 3782830762530834415}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+--- !u!1 &3898953422812762104
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5367051288385633483}
+ - component: {fileID: 1702314778007742657}
+ - component: {fileID: 7035793209796272446}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5367051288385633483
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3898953422812762104}
+ 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: 7802775192081720858}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 0}
+ m_AnchoredPosition: {x: 604.5001, y: 46}
+ m_SizeDelta: {x: -201.0003, y: 2}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1702314778007742657
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3898953422812762104}
+ m_CullTransparentMesh: 0
+--- !u!114 &7035793209796272446
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3898953422812762104}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0, g: 0.654902, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 0}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
--- !u!1 &5048230554787614286
GameObject:
m_ObjectHideFlags: 0
@@ -2266,3 +2879,691 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text:
+--- !u!1 &5676759178343810524
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2035327872646395778}
+ - component: {fileID: 5985030434983663392}
+ - component: {fileID: 2067336493519971749}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2035327872646395778
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5676759178343810524}
+ 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: 7802775192081720858}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 0}
+ m_AnchoredPosition: {x: 604.5001, y: 64.802}
+ m_SizeDelta: {x: -201, y: 40}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5985030434983663392
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5676759178343810524}
+ m_CullTransparentMesh: 0
+--- !u!114 &2067336493519971749
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5676759178343810524}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0, g: 0.654902, b: 1, a: 0}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 0}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+--- !u!1 &6157361196162123473
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5166895380907273883}
+ - component: {fileID: 8435847850604565649}
+ - component: {fileID: 3902635775818097575}
+ - component: {fileID: 5016750666297025432}
+ m_Layer: 5
+ m_Name: private2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5166895380907273883
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6157361196162123473}
+ 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:
+ - {fileID: 3533505788835899153}
+ m_Father: {fileID: 7592808747051568684}
+ m_RootOrder: 3
+ 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: 118, y: -112}
+ m_SizeDelta: {x: 275.2, y: 40.7}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8435847850604565649
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6157361196162123473}
+ m_CullTransparentMesh: 0
+--- !u!114 &3902635775818097575
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6157361196162123473}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 0}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ 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
+--- !u!114 &5016750666297025432
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6157361196162123473}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, 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: 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_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_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 3902635775818097575}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+--- !u!1 &6200063954658299623
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7122593223438226224}
+ - component: {fileID: 4344884782895856488}
+ - component: {fileID: 4339673559324418296}
+ - component: {fileID: 5598822046738737817}
+ m_Layer: 0
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7122593223438226224
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6200063954658299623}
+ 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: 3047544484574874014}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 1}
+ m_AnchorMax: {x: 0.5, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 766, y: 1213}
+ m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &4344884782895856488
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6200063954658299623}
+ m_CullTransparentMesh: 0
+--- !u!114 &4339673559324418296
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6200063954658299623}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 0.98039216, b: 0.83137256, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 39
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 40
+ m_Alignment: 0
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u4E3A\u786E\u4FDD\u60A8\u7684\u6E38\u620F\u4F53\u9A8C\uFF0C\u6211\u4EEC\u5C06\u5728\u60A8\u4F7F\u7528\u6211\u4EEC\u7684\u670D\u52A1\u8FC7\u7A0B\u4E2D\u7533\u8BF7\u4EE5\u4E0B\u6743\u9650\uFF0C\u5C4A\u65F6\u60A8\u53EF\u4EE5\u9009\u62E9\u540C\u610F\u6216\u8005\u62D2\u7EDD\u5F00\u542F\u76F8\u5173\u6743\u9650\uFF0C\u82E5\u662F\u62D2\u7EDD\u5219\u4F1A\u5F71\u54CD\u90E8\u5206\u529F\u80FD\uFF1A\r\n\n\u50A8\u5B58\u6743\u9650\r\n\u6211\u4EEC\u8BBF\u95EE\u60A8\u7684\u50A8\u5B58\u6743\u9650\u662F\u4E3A\u4E86\u5411\u60A8\u63D0\u4F9B\u6E38\u620F\u622A\u56FE\u4FDD\u5B58\u529F\u80FD\r\n\n\u4F4D\u7F6E\u6743\u9650\r\r\n\u6211\u4EEC\u8BBF\u95EE\u60A8\u7684\u4F4D\u7F6E\u6743\u9650\u662F\u4E3A\u4E86\u5411\u60A8\u63D0\u4F9B\u5929\u68AF\u8D5B\u6392\u540D\u529F\u80FD\r\n\n\u901A\u77E5\u6743\u9650\r\r\n\u6211\u4EEC\u8BBF\u95EE\u60A8\u7684\u901A\u77E5\u6743\u9650\u662F\u4E3A\u4E86\u786E\u4FDD\u7528\u6237\u53CA\u65F6\u83B7\u53D6\u6E38\u620F\u6D88\u606F\r\n\n\u7535\u8BDD\u6743\u9650\r\r\n\u6211\u4EEC\u8BBF\u95EE\u60A8\u7684\u7535\u8BDD\u6743\u9650\u662F\u4E3A\u4E86\u5206\u6790\u6E38\u620F\u7684\u8FD0\u884C\u72B6\u6001\uFF0C\u4F18\u5316\u6E38\u620F\u4F53\u9A8C\r\n\n\u9EA6\u514B\u98CE\u6743\u9650\r\r\n\u6211\u4EEC\u8BBF\u95EE\u60A8\u7684\u9EA6\u514B\u98CE\u6743\u9650\u662F\u4E3A\u4E86\u5411\u60A8\u63D0\u4F9B\u8BED\u97F3\u8F6C\u6587\u5B57\u6E38\u620F\u529F\u80FD\r\n\n"
+ LanguageIndex: 0
+--- !u!114 &5598822046738737817
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6200063954658299623}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 0
+ m_VerticalFit: 2
+--- !u!1 &6737231849877528834
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 733935362602501219}
+ - component: {fileID: 5114355091779244791}
+ - component: {fileID: 1574630212374891793}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &733935362602501219
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6737231849877528834}
+ 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: 4662618145885411357}
+ 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: 1}
+ m_SizeDelta: {x: 0, y: 2}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5114355091779244791
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6737231849877528834}
+ m_CullTransparentMesh: 0
+--- !u!114 &1574630212374891793
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6737231849877528834}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0, g: 0.654902, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 0}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+--- !u!1 &6817183711902729048
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3533505788835899153}
+ - component: {fileID: 3009251406722618390}
+ - component: {fileID: 916857717115456149}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3533505788835899153
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6817183711902729048}
+ 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: 5166895380907273883}
+ 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: 1}
+ m_SizeDelta: {x: 0, y: 2}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3009251406722618390
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6817183711902729048}
+ m_CullTransparentMesh: 0
+--- !u!114 &916857717115456149
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6817183711902729048}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0, g: 0.654902, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 0}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+--- !u!1 &7376968313563432897
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4077618250820233377}
+ m_Layer: 5
+ m_Name: grant
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &4077618250820233377
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7376968313563432897}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1.0000799, y: 1.0000799, z: 1.0000799}
+ m_Children:
+ - {fileID: 5880767674647597976}
+ m_Father: {fileID: 224278165673533222}
+ m_RootOrder: 3
+ 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: 0.70233154, y: 45.219}
+ m_SizeDelta: {x: 766, y: 442.13}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &8145650162984891725
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3111124380791190687}
+ - component: {fileID: 4139803596032845905}
+ - component: {fileID: 1258097589001146090}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3111124380791190687
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8145650162984891725}
+ 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: 7802775192081720858}
+ 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: 1}
+ m_SizeDelta: {x: 0, y: 2}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4139803596032845905
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8145650162984891725}
+ m_CullTransparentMesh: 0
+--- !u!114 &1258097589001146090
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8145650162984891725}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0, g: 0.654902, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 0}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+--- !u!1 &8377219205455052899
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5577629481923578102}
+ - component: {fileID: 3176625777208361001}
+ - component: {fileID: 3066431331265806355}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5577629481923578102
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8377219205455052899}
+ 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: 4989184049301841463}
+ 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: 1}
+ m_SizeDelta: {x: 0, y: 2}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3176625777208361001
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8377219205455052899}
+ m_CullTransparentMesh: 0
+--- !u!114 &3066431331265806355
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8377219205455052899}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0, g: 0.654902, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 0}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+--- !u!1 &8565158425788822560
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5880767674647597976}
+ - component: {fileID: 5174286553451481561}
+ m_Layer: 5
+ m_Name: Scroll View
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5880767674647597976
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8565158425788822560}
+ 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:
+ - {fileID: 3047544484574874014}
+ m_Father: {fileID: 4077618250820233377}
+ m_RootOrder: 0
+ 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: -6.7}
+ m_SizeDelta: {x: 0, y: -13.3}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &5174286553451481561
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8565158425788822560}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Content: {fileID: 7122593223438226224}
+ m_Horizontal: 0
+ m_Vertical: 1
+ m_MovementType: 1
+ m_Elasticity: 0.1
+ m_Inertia: 1
+ m_DecelerationRate: 0.135
+ m_ScrollSensitivity: 1
+ m_Viewport: {fileID: 3047544484574874014}
+ m_HorizontalScrollbar: {fileID: 0}
+ m_VerticalScrollbar: {fileID: 0}
+ m_HorizontalScrollbarVisibility: 2
+ m_VerticalScrollbarVisibility: 2
+ m_HorizontalScrollbarSpacing: -3
+ m_VerticalScrollbarSpacing: -3
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
diff --git a/Assets/Scripts/GameInit/UpdateMsgBox.cs b/Assets/Scripts/GameInit/UpdateMsgBox.cs
index 74fb220e89..3dbd5aba91 100644
--- a/Assets/Scripts/GameInit/UpdateMsgBox.cs
+++ b/Assets/Scripts/GameInit/UpdateMsgBox.cs
@@ -45,6 +45,16 @@ namespace GameLogic {
[SerializeField]
Text msg;
///
+ /// 消息
+ ///
+ [SerializeField]
+ GameObject proto;
+ ///
+ /// 消息
+ ///
+ [SerializeField]
+ GameObject grant;
+ ///
/// title
///
[SerializeField]
@@ -53,11 +63,30 @@ namespace GameLogic {
/// 点击回调
///
UnityAction action;
+ ///
+ /// 隐私协议按钮
+ ///
+ [SerializeField]
+ Button[] protoButton;
+ [SerializeField]
+ Button[] privateButton;
+
+
protected void Awake()
{
buttonL.onClick.AddListener(LClickHandler);
buttonR.onClick.AddListener(RClickHandler);
buttonC.onClick.AddListener(CClickHandler);
+
+ foreach(Button b in protoButton)
+ {
+ b.onClick.AddListener(ProtoClickHandler);
+ }
+ foreach (Button b in privateButton)
+ {
+ b.onClick.AddListener(PrivateClickHandler);
+ }
+
title.text = SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.TIPS);
}
@@ -87,6 +116,56 @@ namespace GameLogic {
{
CallBack(2);
}
+ ///
+ /// 用户隐私协议按钮点击事件
+ ///
+ private void ProtoClickHandler()
+ {
+ string UserChannel = ConfigManager.Instance.GetSettingValue("USER_CHANNEL");
+ string Channel = VersionManager.Instance.GetVersionInfo("channel");
+ string serverUrl = VersionManager.Instance.GetVersionInfo("serverUrl");
+ string ChannelID = UserChannel != null ? UserChannel : Channel;
+ string url = serverUrl + "jl_loginserver/getAgreement?gamePack=" + ChannelID;
+ NetworkManager.Instance.SendGetHttp(url, null, (string json) =>
+ {
+ Hashtable info = MiniJSON.jsonDecode(json) as Hashtable;
+ Hashtable parms = info["parms"] as Hashtable;
+ string instructions = parms["instructions"] as string;
+ if (ConfigManager.Instance.IsSettingActive("INNER_WEB_CONTROL"))
+ {
+ SDK.SDKManager.Instance.OpenWeb(instructions);
+ }
+ else
+ {
+ Application.OpenURL(url);
+ }
+ }, null, null);
+ }
+ ///
+ /// 用户隐私协议按钮点击事件
+ ///
+ private void PrivateClickHandler()
+ {
+ string UserChannel = ConfigManager.Instance.GetSettingValue("USER_CHANNEL");
+ string Channel = VersionManager.Instance.GetVersionInfo("channel");
+ string serverUrl = VersionManager.Instance.GetVersionInfo("serverUrl");
+ string ChannelID = UserChannel != null ? UserChannel : Channel;
+ string url = serverUrl + "jl_loginserver/getAgreement?gamePack=" + ChannelID;
+ NetworkManager.Instance.SendGetHttp(url, null, (string json) =>
+ {
+ Hashtable info = MiniJSON.jsonDecode(json) as Hashtable;
+ Hashtable parms = info["parms"] as Hashtable;
+ string privacy = parms["privacy"] as string;
+ if (ConfigManager.Instance.IsSettingActive("INNER_WEB_CONTROL"))
+ {
+ SDK.SDKManager.Instance.OpenWeb(privacy);
+ }
+ else
+ {
+ Application.OpenURL(url);
+ }
+ }, null, null);
+ }
///
/// 回调
@@ -110,6 +189,9 @@ namespace GameLogic {
public void Show(string strL, string strR, string msg, UnityAction action)
{
this.gameObject.SetActive(true);
+ this.msg.gameObject.SetActive(true);
+ this.proto.gameObject.SetActive(false);
+ this.grant.gameObject.SetActive(false);
this.buttonL.gameObject.SetActive(true);
this.buttonR.gameObject.SetActive(true);
this.buttonC.gameObject.SetActive(false);
@@ -128,6 +210,9 @@ namespace GameLogic {
public void Show(string strc, string msg, UnityAction action)
{
this.gameObject.SetActive(true);
+ this.msg.gameObject.SetActive(true);
+ this.proto.gameObject.SetActive(false);
+ this.grant.gameObject.SetActive(false);
this.buttonL.gameObject.SetActive(false);
this.buttonR.gameObject.SetActive(false);
this.buttonC.gameObject.SetActive(true);
@@ -146,11 +231,58 @@ namespace GameLogic {
public void Show(string msg)
{
this.gameObject.SetActive(true);
+ this.msg.gameObject.SetActive(true);
+ this.proto.gameObject.SetActive(false);
+ this.grant.gameObject.SetActive(false);
this.buttonL.gameObject.SetActive(false);
this.buttonR.gameObject.SetActive(false);
this.buttonC.gameObject.SetActive(false);
this.msg.text = msg;
}
+
+
+ ///
+ /// 显示用户隐私协议
+ ///
+ ///
+ ///
+ ///
+ public void ShowProto(string strL, string strR, string msg, UnityAction action)
+ {
+ this.gameObject.SetActive(true);
+ this.msg.gameObject.SetActive(false);
+ this.proto.gameObject.SetActive(true);
+ this.grant.gameObject.SetActive(false);
+ this.buttonL.gameObject.SetActive(true);
+ this.buttonR.gameObject.SetActive(true);
+ this.buttonC.gameObject.SetActive(false);
+ this.buttonLText.text = strL;
+ this.buttonRText.text = strR;
+ this.action = action;
+ //设置显示内容
+ this.proto.GetComponent().text = msg;
+ }
+ ///
+ /// 显示权限申请
+ ///
+ ///
+ ///
+ ///
+ public void ShowGrant(string strC, string msg, UnityAction action)
+ {
+ this.gameObject.SetActive(true);
+ this.msg.gameObject.SetActive(false);
+ this.proto.gameObject.SetActive(false);
+ this.grant.gameObject.SetActive(true);
+ this.buttonL.gameObject.SetActive(false);
+ this.buttonR.gameObject.SetActive(false);
+ this.buttonC.gameObject.SetActive(true);
+ this.buttonCText.text = strC;
+ this.action = action;
+ //设置显示内容
+ this.grant.transform.Find("Scroll View/Viewport/Text").GetComponent().text = msg;
+ }
+
}
}
diff --git a/Assets/Scripts/GameInit/UpdatePanel.cs b/Assets/Scripts/GameInit/UpdatePanel.cs
index 84cc9d1dae..f6bca1d176 100644
--- a/Assets/Scripts/GameInit/UpdatePanel.cs
+++ b/Assets/Scripts/GameInit/UpdatePanel.cs
@@ -30,11 +30,12 @@ namespace GameLogic
UpdateMsgBox msgBox;
AssetBundle bundle;
+
void Awake()
{
msgBox.gameObject.SetActive(false);
//StartCoroutine(GetGameConfig());
- BeginUpdatePlatform();
+ //BeginUpdatePlatform();
}
public IEnumerator LoadFromStream(Action act)
@@ -58,6 +59,7 @@ namespace GameLogic
else
{
Hashtable table = MiniJSON.jsonDecode(uwr.downloadHandler.text) as Hashtable;
+ // 背景图
string bgName = table["UpdatePanelBG"] as string;
string texPath = Application.streamingAssetsPath + "/Res/" + bgName + ".png";
#if UNITY_IOS
@@ -104,8 +106,85 @@ namespace GameLogic
img.color = new Color(1f, 1f, 1f, 1f);
go.SetActive(true);
go2.SetActive(true);
+
+
+ // 用户隐私协议
+ TryGetUserAgree(() =>
+ {
+ BeginUpdatePlatform();
+ });
+
}));
+
}
+
+ private void TryGetUserAgree(Action a)
+ {
+ // 判断是否需要显示用户隐私界面
+ Boolean needUserAgree = ConfigManager.Instance.IsSettingActive("APP_START_USER_AGREE");
+ if (!needUserAgree)
+ {
+ if (a != null)
+ {
+ a();
+ }
+ return;
+ }
+ // 判断是否已经同意
+ bool isAgree = PlayerPrefs.GetInt("APP_IsAgreeUser", 0) == 1;
+ if (isAgree)
+ {
+ if (a != null)
+ {
+ a();
+ }
+ return;
+ }
+ // 没同意则弹窗提示
+ string proto = "在您使用我们(猕猴桃)的服务前,请您务必审慎阅读、" +
+ "充分理解猕猴桃用户协议和猕猴桃隐私政策的各条款。" +
+ "同时,您应特别注意前述协议中免除或者限制我们责任的条款、对您权利进行限制的、约定争议解决方式和司法管辖的条款。" +
+ "如您已经详细阅读并同意猕猴桃用户协议和猕猴桃隐私政策," +
+ "请点击“同意”开始使用我们的服务。";
+ msgBox.ShowProto("不同意", "同意", proto, (r1) =>
+ {
+ if (r1 == 1)
+ {
+ string grant = "为确保您的游戏体验,我们将在您使用我们的服务过程中申请以下权限,届时您可以选择同意或者拒绝开启相关权限,若是拒绝则会影响部分功能:" +
+ "\n\n" +
+ " 储存权限 " +
+ "我们访问您的储存权限是为了向您提供游戏截图保存功能" +
+ "\n\n" +
+ " 电话权限 " +
+ "我们访问您的电话权限是为了分析游戏的运行状态,优化游戏体验";
+
+ msgBox.ShowGrant("确定", grant,(result) =>
+ {
+ PlayerPrefs.SetInt("APP_IsAgreeUser", 1);
+ if (a != null)
+ {
+ a();
+ }
+ });
+ }
+ else
+ {
+ msgBox.Show("退出游戏", "查看协议", "需要同意本隐私权政策才能继续游戏,若仍不同意本隐私权政策,很遗憾我们将无法为您提供服务。", (r2) =>
+ {
+ if (r2 == 1)
+ {
+ TryGetUserAgree(a);
+ }
+ else
+ {
+ Application.Quit();
+ }
+
+ });
+ }
+ });
+ }
+
private void OnDestroy()
{
string updatePanelBg = ConfigManager.Instance.GetConfigInfo("Setting.UPDATE_PANEL_BG.value");
@@ -118,21 +197,21 @@ namespace GameLogic
private void Update()
{
- if (Input.GetKeyDown(KeyCode.Escape))
- {
- if(AppConst.isSDK && App.SDKMgr.IsSupportExit())
- {
- App.SDKMgr.ExitGame();
- }
- else
- {
- msgBox.Show(SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CANEL), SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CONFIRM), SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CONFIRM_CLOSE), (result) =>
- {
- if (result == 1)
- Application.Quit();
- });
- }
- }
+ //if (Input.GetKeyDown(KeyCode.Escape))
+ //{
+ // if(AppConst.isSDK && App.SDKMgr.IsSupportExit())
+ // {
+ // App.SDKMgr.ExitGame();
+ // }
+ // else
+ // {
+ // msgBox.Show(SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CANEL), SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CONFIRM), SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CONFIRM_CLOSE), (result) =>
+ // {
+ // if (result == 1)
+ // Application.Quit();
+ // });
+ // }
+ //}
}
// void Start()