diff --git a/Assets/LuaFramework/Scripts/SDK/Proxy.cs b/Assets/LuaFramework/Scripts/SDK/Proxy.cs index 9425b46514..f07ee9e56f 100644 --- a/Assets/LuaFramework/Scripts/SDK/Proxy.cs +++ b/Assets/LuaFramework/Scripts/SDK/Proxy.cs @@ -23,6 +23,7 @@ namespace SDK public virtual void CustomEvent(string events,string desc, string type) { } public virtual void NewRoleTutorial(string eventName, string guide_start_time, string guide_end_time, string serverId, string serverName, string roleName, string roleId) { } + public virtual void OpenWeb(string url) { } } } diff --git a/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs b/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs index 508fdb1e73..35697a4e2a 100644 --- a/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs +++ b/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs @@ -17,6 +17,8 @@ namespace SDK public AndroidProxy() { + + Debug.Log("AndroidProxy INit"); var player = new AndroidJavaClass(CLS_UNITY_PLAYER); currentActivity = player.GetStatic("currentActivity"); } @@ -102,6 +104,11 @@ namespace SDK { return currentActivity.Call("GetOrderID"); } + //打开用户协议 + public override void OpenWeb(string url) + { + currentActivity.Call("OpenWeb", url); + } //SDK截屏 diff --git a/Assets/LuaFramework/Scripts/SDK/SDKManager.cs b/Assets/LuaFramework/Scripts/SDK/SDKManager.cs index 0bc558f676..550803ada7 100644 --- a/Assets/LuaFramework/Scripts/SDK/SDKManager.cs +++ b/Assets/LuaFramework/Scripts/SDK/SDKManager.cs @@ -157,7 +157,11 @@ namespace SDK { return proxy.GetPayOrderID(); } - + //打开用户协议 + public void OpenWeb(string url) + { + proxy.OpenWeb(url); + } public void CaptureShot() { proxy.ShotCapture(); diff --git a/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab index 80220a2b9f..bf17c16456 100644 --- a/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab @@ -392,6 +392,181 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: +--- !u!1 &1284033474063514719 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5682579529262169544} + - component: {fileID: 8552513486474370558} + - component: {fileID: 4639789661108568164} + - component: {fileID: 4982813197472842308} + - component: {fileID: 2811035918845018594} + - component: {fileID: 2366965926352858565} + - component: {fileID: 1366463205790917798} + m_Layer: 5 + m_Name: privacyBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5682579529262169544 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284033474063514719} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -29.875} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8062223701401810675} + m_Father: {fileID: 1415383307548408226} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 682, y: -50} + m_SizeDelta: {x: 160, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8552513486474370558 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284033474063514719} + m_CullTransparentMesh: 0 +--- !u!114 &4639789661108568164 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284033474063514719} + 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: 3 + 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: 2811035918845018594} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &4982813197472842308 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284033474063514719} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &2811035918845018594 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284033474063514719} + 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: 0.9725491, g: 0.91372555, b: 0.7843138, 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: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 45 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u9690\u79C1\u534F\u8BAE" + LanguageIndex: 0 +--- !u!114 &2366965926352858565 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284033474063514719} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 +--- !u!114 &1366463205790917798 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284033474063514719} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &1428940859373766703 GameObject: m_ObjectHideFlags: 0 @@ -580,6 +755,598 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: ver +--- !u!1 &1506794007915790917 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4859830735356967889} + - component: {fileID: 8387703281569279826} + - component: {fileID: 2043667282894292089} + m_Layer: 0 + m_Name: gou + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4859830735356967889 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1506794007915790917} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00032234192} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 657274958073366827} + 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: 0, y: 8.9} + m_SizeDelta: {x: 74, y: 62} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8387703281569279826 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1506794007915790917} + m_CullTransparentMesh: 0 +--- !u!114 &2043667282894292089 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1506794007915790917} + 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: 21300000, guid: 84b137e960461f44082b1491d6ce5b7b, 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 +--- !u!1 &2613516975960434499 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2286626694426901686} + - component: {fileID: 282263520566598444} + - component: {fileID: 7981329815044728908} + - component: {fileID: 6426512814685555305} + - component: {fileID: 7128023571528531061} + - component: {fileID: 495881993378168828} + - component: {fileID: 944538597619911451} + m_Layer: 5 + m_Name: instructionsBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2286626694426901686 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2613516975960434499} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -29.875} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4775120823550093142} + m_Father: {fileID: 1415383307548408226} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 467, y: -50} + m_SizeDelta: {x: 160, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &282263520566598444 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2613516975960434499} + m_CullTransparentMesh: 0 +--- !u!114 &7981329815044728908 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2613516975960434499} + 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: 3 + 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: 7128023571528531061} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &6426512814685555305 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2613516975960434499} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &7128023571528531061 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2613516975960434499} + 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: 0.9725491, g: 0.91372555, b: 0.7843138, 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: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u7528\u6237\u534F\u8BAE" + LanguageIndex: 0 +--- !u!114 &495881993378168828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2613516975960434499} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 +--- !u!114 &944538597619911451 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2613516975960434499} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!1 &2951742164214395304 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 480309533766912281} + - component: {fileID: 8866466603871563102} + - component: {fileID: 389794591670744168} + - component: {fileID: 3482191010951260943} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &480309533766912281 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2951742164214395304} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -29.875} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1415383307548408226} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 219.5, y: -50} + m_SizeDelta: {x: 315, y: 55} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8866466603871563102 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2951742164214395304} + m_CullTransparentMesh: 0 +--- !u!114 &389794591670744168 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2951742164214395304} + 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: 0.9725491, g: 0.91372555, b: 0.7843138, 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: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6211\u5DF2\u8BE6\u7EC6\u9605\u8BFB\u5E76\u540C\u610F" + LanguageIndex: 0 +--- !u!114 &3482191010951260943 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2951742164214395304} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!1 &2953530719934720246 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4775120823550093142} + - component: {fileID: 2278814162634038389} + - component: {fileID: 2870230495860880470} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4775120823550093142 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2953530719934720246} + 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: 2286626694426901686} + 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} + m_AnchoredPosition: {x: 0, y: 8} + m_SizeDelta: {x: 150, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2278814162634038389 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2953530719934720246} + m_CullTransparentMesh: 0 +--- !u!114 &2870230495860880470 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2953530719934720246} + 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: 21300000, guid: 26ce1a2f8851e004e88e569a15a5a1f8, 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 +--- !u!1 &2986731732101557248 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1498997702403170812} + - component: {fileID: 6023902533507475951} + - component: {fileID: 6336292320092951179} + - component: {fileID: 6788520911333177205} + m_Layer: 5 + m_Name: Text (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1498997702403170812 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2986731732101557248} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -29.875} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1415383307548408226} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 574.5, y: -50} + m_SizeDelta: {x: 35, y: 55} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6023902533507475951 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2986731732101557248} + m_CullTransparentMesh: 0 +--- !u!114 &6336292320092951179 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2986731732101557248} + 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: 0.9725491, g: 0.91372555, b: 0.7843138, 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: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u548C" + LanguageIndex: 0 +--- !u!114 &6788520911333177205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2986731732101557248} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!1 &3179790498335030403 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1415383307548408226} + - component: {fileID: 2913722661133017400} + - component: {fileID: 3377218132965148719} + m_Layer: 0 + m_Name: protos + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1415383307548408226 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3179790498335030403} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 100.11203} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 657274958073366827} + - {fileID: 480309533766912281} + - {fileID: 2286626694426901686} + - {fileID: 1498997702403170812} + - {fileID: 5682579529262169544} + m_Father: {fileID: 8490762427581985335} + m_RootOrder: 16 + 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, y: -747} + m_SizeDelta: {x: 762, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2913722661133017400 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3179790498335030403} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 10 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 +--- !u!114 &3377218132965148719 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3179790498335030403} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &4988553398133080000 GameObject: m_ObjectHideFlags: 0 @@ -992,6 +1759,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u516C\u544A" LanguageIndex: 0 +--- !u!1 &5965083409931562328 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8062223701401810675} + - component: {fileID: 4525843538574433556} + - component: {fileID: 5768894191053497327} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8062223701401810675 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5965083409931562328} + 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: 5682579529262169544} + 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} + m_AnchoredPosition: {x: 0, y: 8} + m_SizeDelta: {x: 150, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4525843538574433556 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5965083409931562328} + m_CullTransparentMesh: 0 +--- !u!114 &5768894191053497327 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5965083409931562328} + 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: 21300000, guid: 26ce1a2f8851e004e88e569a15a5a1f8, 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 --- !u!1 &5998048514978194202 GameObject: m_ObjectHideFlags: 0 @@ -11698,6 +12539,7 @@ RectTransform: - {fileID: 6453992086623595374} - {fileID: 650226395} - {fileID: 2126607397} + - {fileID: 1415383307548408226} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -46721,6 +47563,124 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8945494105284294371 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 657274958073366827} + - component: {fileID: 5907649678314136039} + - component: {fileID: 7229184497544103183} + - component: {fileID: 1705867544654539829} + m_Layer: 0 + m_Name: Confirm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &657274958073366827 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8945494105284294371} + 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: 4859830735356967889} + m_Father: {fileID: 1415383307548408226} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 26, y: -50} + m_SizeDelta: {x: 52, y: 52} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5907649678314136039 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8945494105284294371} + m_CullTransparentMesh: 0 +--- !u!114 &7229184497544103183 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8945494105284294371} + 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: 21300000, guid: d1e04308c0a66644a804a2800a96d3a2, 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 +--- !u!114 &1705867544654539829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8945494105284294371} + 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: 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_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: 7229184497544103183} + 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 &9138077029926503607 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/SplashPanel/SplashPanel.prefab b/Assets/ManagedResources/SplashPanel/SplashPanel.prefab index f5085e3399..c7fc5368b6 100644 --- a/Assets/ManagedResources/SplashPanel/SplashPanel.prefab +++ b/Assets/ManagedResources/SplashPanel/SplashPanel.prefab @@ -189,7 +189,7 @@ Camera: m_GameObject: {fileID: 7877014286502686225} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 3 + m_ClearFlags: 2 m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} m_projectionMatrixMode: 1 m_SensorSize: {x: 36, y: 24} diff --git a/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab b/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab index bdbc9a4ed8..67c72708a6 100644 --- a/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab +++ b/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab @@ -879,7 +879,7 @@ Camera: m_GameObject: {fileID: 1487766760680242} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 3 + m_ClearFlags: 2 m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} m_projectionMatrixMode: 1 m_SensorSize: {x: 36, y: 24} diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua index 5765838a2c..3964a7283d 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua @@ -112,12 +112,12 @@ function PackageManager.SetVideo(obj, bg) obj:SetActive(true) end else - LogError("视频加载失败:"..this.config.VideoName) + Log("视频加载失败:"..this.config.VideoName) end end) end else - LogError("包名:"..tostring(this.config.PackageName).."登录视频为空!") + Log("包名:"..tostring(this.config.PackageName).."登录视频为空!") end end end diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua index dd548fe821..4aa4d5b70b 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua @@ -18,8 +18,10 @@ ServerConfigManager.SettingConfig = { PACKAGE_CONFIG = "PACKAGE_CONFIG", -- 包配置 IS_NO_TALKING = "IS_NO_TALKING", -- 禁言 IS_LOAD_STREAMING = "IS_LOAD_STREAMING", -- 是否加载外部资源 - CURVED_TEXT_CODE = "CURVED_TEXT_CODE", -- 是否可以显示弧形文字 - IS_SELECT_RESLUTION = "IS_SELECT_RESLUTION", --是否可以选择帧率 + CURVED_TEXT_CODE = "CURVED_TEXT_CODE", -- 是否可以显示弧形文字 + IS_SELECT_RESLUTION = "IS_SELECT_RESLUTION", -- 是否可以选择帧率 + USER_CHANNEL = "USER_CHANNEL", -- 获取登录信息渠道 + USER_PROTO = "USER_PROTO", -- 用户协议功能是否开启 } diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index ee3a2528fd..05238e29c1 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -147,22 +147,22 @@ local tabs = { default = "c_ccfy_icon2_zh", lock = "c_ccfy_icon2_zh", select = "c_ccfy_icon1_zh", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, - [36] = { --第五周 丹心碧血 - default = "d_danxinbixue_icon2_zh", lock = "d_danxinbixue_icon2_zh", select = "d_danxinbixue_bicon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [37] = { --第五周 丹心碧血 - default = "d_danxinbixue_icon2_zh", lock = "d_danxinbixue_icon2_zh", select = "d_danxinbixue_bicon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [38] = { --第五周 丹心碧血 - default = "d_danxinbixue_icon2_zh", lock = "d_danxinbixue_icon2_zh", select = "d_danxinbixue_bicon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [39] = { --第六周 势不可挡 + [36] = { --第六周 势不可挡 default = "s_shibukedang_bicon1_zh", lock = "s_shibukedang_bicon1_zh", select = "s_shibukedang_bicon2_zh", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, + [37] = { --第七周 勇往直前 + default = "s_yongwangzhiqian_icon2_zh", lock = "s_yongwangzhiqian_icon2_zh", select = "s_yongwangzhiqian_icon1_zh", + rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + }, + [38] = { --第八周 运筹帷幄 + default = "y_yunchouweiwo_anniu02_zh", lock = "y_yunchouweiwo_anniu02_zh", select = "y_yunchouweiwo_anniu01_zh", + rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + }, + [39] = { --第九周 移山倒海 + default = "y_yishandaohai_anniu_02_zh", lock = "y_yishandaohai_anniu_02_zh", select = "y_yishandaohai_anniu_01_zh", + rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + }, [40] = { --社稷大典 default = "r_guanka_sheji_anniu_02_zh", lock = "r_guanka_sheji_anniu_02_zh", select = "r_guanka_sheji_anniu_01_zh", rpType = RedPointType.Celebration,panelType = PanelType.Celebration,ActType = ActivityTypeDef.Celebration diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua index 56703c1c9a..a5921c5588 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua @@ -40,6 +40,11 @@ local bannerType = { [32] = {compent = "bg1",titilebg1 = "s_suoxiangpimi_banner_zh"}, [33] = {compent = "bg1",titilebg1 = "x_xialuxiangfeng_banner_zh"}, [34] = {compent = "bg1",titilebg1 = "t_tongqiangtiebi_banner_zh"}, + [35] = {compent = "bg1",titilebg1 = "d_danxinbixue_banner_zh"}, + [36] = {compent = "bg1",titilebg1 = "s_shibukedang_banner_zh"}, + [37] = {compent = "bg1",titilebg1 = "s_yongwangzhiqian_banner_zh"}, + [38] = {compent = "bg1",titilebg1 = "y_yunchouweiwo_banner_zh"}, + [39] = {compent = "bg1",titilebg1 = "y_yishandaohai_banner_zh"}, } local GlobalActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity) function DynamicTaskPage:ctor(mainPanel, gameObject) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua index 05adf39717..6ccc4e0af4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua @@ -88,19 +88,6 @@ function FormationEditPopup:BindEvent() for i = 1, #heros do heros[i].position = i end - --后端提交后放开 - -- for i, v in ipairs(choosedList) do - -- local hero = {} - -- hero.heroId = v.did - -- hero.position = #choosedList + 1 - -- table.insert(heros,hero) - -- end - -- table.sort(heros,function (a,b) - -- return HeroManager.GetSingleHeroData(a.heroId).warPower > HeroManager.GetSingleHeroData(b.heroId).warPower - -- end) - -- for i = 1, #heros do - -- heros[i].position = i - -- end if #choosedList <= maxNum and #choosedList > 0 then NetManager.TrialHeroInfoSaveRequest(heros,function(msg) PopupTipPanel.ShowTip(Language[10670]) diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 28161a9662..ccfccee328 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -20,11 +20,17 @@ local LoginRoot_Channel = ServerConfigManager.GetVersionInfo("channel") local LoginRoot_Version = ServerConfigManager.GetVersionInfo("version") local LoginRoot_PackageVersion = ServerConfigManager.GetVersionInfo("packageVersion") local LoginRoot_NoticeChannel = ServerConfigManager.GetSettingValue(ServerConfigManager.SettingConfig.NOTICE_CHANNEL) or "" +local LoginRoot_UserChannel = ServerConfigManager.GetSettingValue(ServerConfigManager.SettingConfig.USER_CHANNEL) or "" local orginLayer +local IsUserProtoActive = ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.USER_PROTO) + local timeStamp = Time.realtimeSinceStartup local timeSign = Util.MD5Encrypt(string.format("%s%s", timeStamp, LoginManager.sign)) +local UrlList = {} +local HaveConfirm = false + --初始化组件(用于子类重写) function this:InitComponent() this.spLoader = SpriteLoader.New() @@ -88,7 +94,7 @@ function this:InitComponent() this.healthTip:SetActive(IS_SHOW_HEALTH_TIP) this.bh = Util.GetGameObject(this.gameObject, "healthTip/bh"):GetComponent("Text") local bhContent = PackageManager.GetBHContent() - LogError(tostring(bhContent)) + -- LogError(tostring(bhContent)) if bhContent then this.bh.text = bhContent else @@ -96,6 +102,14 @@ function this:InitComponent() end this.video = Util.GetGameObject(this.gameObject, "VideoPlayer") + + --用户隐私协议 + this.protos = Util.GetGameObject(this.gameObject, "protos") + this.instructionsBtn = Util.GetGameObject(this.gameObject, "protos/instructionsBtn") + this.privacyBtn = Util.GetGameObject(this.gameObject, "protos/privacyBtn") + this.ConfirmBtn = Util.GetGameObject(this.gameObject, "protos/Confirm") + this.ConfirmImg = Util.GetGameObject(this.ConfirmBtn, "gou") + this.protos:SetActive(IsUserProtoActive) end --绑定事件(用于子类重写) @@ -155,6 +169,24 @@ function this:BindEvent() this.SDKLogin() end) + --用户隐私协议 + Util.AddClick(this.instructionsBtn, function() + SDKMgr:OpenWeb(UrlList[1]) + end) + Util.AddClick(this.privacyBtn, function() + SDKMgr:OpenWeb(UrlList[2]) + end) + Util.AddClick(this.ConfirmBtn, function() + local confirm = PlayerPrefs.GetInt("IHaveConfirmProtos") + if confirm == 0 then + this.ConfirmImg:SetActive(true) + PlayerPrefs.SetInt("IHaveConfirmProtos",1) + elseif confirm == 1 then + this.ConfirmImg:SetActive(false) + PlayerPrefs.SetInt("IHaveConfirmProtos",0) + end + end) + end -- sdk 初始化完成回调 @@ -254,7 +286,7 @@ function this:OnOpen(...) -- 获取服务器列表 this.RequestServerList(userId, this.OnReceiveServerList) end - + local tran = this.tip:GetComponent("RectTransform") --LayoutUtility.GetPreferredWidth(tran) local offsetX = (GetPreferredWidth(tran) + Screen.width) / 2 @@ -273,7 +305,7 @@ end function this.CheckNoticeShow() -- 判断公告显示 - IsShowNotice = SERVER_VERSION == 0 -- 正式服显示公告 + IsShowNotice = true--SERVER_VERSION == 0 -- 正式服显示公告 this.btnNotice:SetActive(IsShowNotice) end -- 打开公告界面 @@ -281,23 +313,26 @@ function this.ShowNotice() RequestPanel.Show(Language[11137]) --LogError("LoginRoot_NoticeChannel=="..LoginRoot_NoticeChannel) -- 如果有渠道包配置的id则加上 + local noticeChannel = LoginRoot_NoticeChannel local subNoticeID = PackageManager.GetSubNoticeID() if subNoticeID then - LoginRoot_NoticeChannel = LoginRoot_NoticeChannel.. subNoticeID + noticeChannel = noticeChannel.. subNoticeID end - networkMgr:SendGetHttp(LoginRoot_Url .. "jl_loginserver/getNotice?timestamp="..timeStamp.."&sign=".. timeSign.."&packageName="..LoginRoot_NoticeChannel,function (str) + local url = LoginRoot_Url .. "jl_loginserver/getNotice?timestamp="..timeStamp.."&sign=".. timeSign.."&packageName="..noticeChannel + Log(url) + networkMgr:SendGetHttp(url,function (str) UIManager.OpenPanel(UIName.NoticePopup,str) end, nil, nil, nil) end -- 请求获取 function this.RequestServerVersion(func) - local ChannelID = LoginRoot_Channel + local ChannelID = LoginRoot_UserChannel == "" and LoginRoot_Channel or LoginRoot_UserChannel local packId = PackageManager.GetPackageID() if packId then ChannelID = ChannelID.. packId end - local url = LoginRoot_Url .. "jl_loginserver/getServerVersion?serverVersion=tishen1"--..ChannelID + local url = LoginRoot_Url .. "jl_loginserver/getServerVersion?serverVersion="..ChannelID LogPink(url) networkMgr:SendGetHttp(url, function (str) LogPink(str) @@ -332,8 +367,52 @@ function this.RequestServerList(userId, callback) Log(url) networkMgr:SendGetHttp(url, callback, nil, nil, nil) end) + + --用户协议,隐私政策 + this.RequestProtos(userId) end +--获取用户隐私协议 +function this.RequestProtos(userId) + this.protos:SetActive(false) + this.ConfirmImg:SetActive(PlayerPrefs.GetInt("IHaveConfirmProtos") == 1) + UrlList[1] = "" + UrlList[2] = "" + if not IsUserProtoActive then + Log("用户和隐私协议功能未开启") + return + end + + local ChannelID = LoginRoot_UserChannel == "" and LoginRoot_Channel or LoginRoot_UserChannel + local PackageID = PackageManager.GetPackageID() + if PackageID then + ChannelID = ChannelID .. PackageID + end + local url = LoginRoot_Url.."jl_loginserver/getAgreement?gamePack="..ChannelID + Log(url) + networkMgr:SendGetHttp(url, function (str) + local json = require 'cjson' + local data = json.decode(str) + if data.parms then + UrlList[1] = data.parms.instructions + UrlList[2] = data.parms.privacy + Log("instructionsUrl:"..tostring(UrlList[1]).." privacyUrl:"..tostring(UrlList[2])) + HaveConfirm = true + else + this.protos:SetActive(false) + Log("用户和隐私协议地址为空") + HaveConfirm = false + return + end + if UrlList[1] ~= "" and UrlList[2] ~="" then + this.protos:SetActive(true) + HaveConfirm = true + else + this.protos:SetActive(false) + HaveConfirm = false + end + end, nil, nil, nil) +end --界面销毁时调用(用于子类重写) function this:OnDestroy() @@ -598,6 +677,10 @@ end this.isLoginClick = false function this.OnLoginClick() + if IsUserProtoActive and HaveConfirm and PlayerPrefs.GetInt("IHaveConfirmProtos") == 0 then + PopupTipPanel.ShowTip("为了保证您的个人隐私和隐私安全,请详细阅读并同意用户协议及隐私政策") + return + end if LoginManager.state == 0 or LoginManager.state == 1 then local function reServerCallback(str) if str == nil then @@ -639,13 +722,14 @@ end function this.RequestHttpLogin() RequestPanel.Show(Language[11144]) local url = "" + local user_channel = LoginRoot_UserChannel == "" and LoginRoot_Channel or LoginRoot_UserChannel if IsSDKLogin then url = LoginRoot_Url .. "jl_loginserver/getUserInfo?openId=" .. AppConst.OpenId .. "&serverId=" .. LoginManager.ServerId .. "&token=" .. AppConst.TokenStr .. "&platform=" .. 1 - .. "&channel=" .. LoginRoot_Channel + .. "&channel=" .. user_channel .. "&sub_channel=" .. LoginRoot_SubChannel .. "&pid=" .. AppConst.SdkChannel --LoginManager.pt_pId .. "&gid=" .. AppConst.SdkPackageName --LoginManager.pt_gId @@ -663,7 +747,7 @@ function this.RequestHttpLogin() .. "&serverId=" .. LoginManager.ServerId .. "&token=111" .. "&platform=1" - .. "&channel=" .. LoginRoot_Channel + .. "&channel=" .. user_channel .. "&sub_channel=" .. LoginRoot_SubChannel .. "&admin=d53b3e8ef74bf72d8aafce3a1c8671a0" .. "&version=" .. LoginRoot_PackageVersion @@ -674,7 +758,7 @@ function this.RequestHttpLogin() .. "&serverId=" .. LoginManager.ServerId .. "&token=" .. LoginManager.token .. "&platform=4" - .. "&channel=" .. LoginRoot_Channel + .. "&channel=" .. user_channel .. "&sub_channel=" .. LoginRoot_SubChannel .. "&admin=d53b3e8ef74bf72d8aafce3a1c8671a0" .. "&version=" .. LoginRoot_PackageVersion diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 7af2d3e013..600bfff946 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -1,4 +1,4 @@ -require "Message/CommonProto_pb" +require "Message/CommonProto_pb" require "Message/ChatProto_pb" require "Message/FightInfoProto_pb" require "Message/MessageTypeProto_pb" diff --git a/Assets/Source/Generate/SDK_SDKManagerWrap.cs b/Assets/Source/Generate/SDK_SDKManagerWrap.cs index fc7eabc4f9..500048c80a 100644 --- a/Assets/Source/Generate/SDK_SDKManagerWrap.cs +++ b/Assets/Source/Generate/SDK_SDKManagerWrap.cs @@ -16,6 +16,7 @@ public class SDK_SDKManagerWrap L.RegFunction("IsSupportExit", IsSupportExit); L.RegFunction("ExitGame", ExitGame); L.RegFunction("GetPayOrderID", GetPayOrderID); + L.RegFunction("OpenWeb", OpenWeb); L.RegFunction("CaptureShot", CaptureShot); L.RegFunction("CustomEvent", CustomEvent); L.RegFunction("NewRoleTutorial", NewRoleTutorial); @@ -191,6 +192,23 @@ public class SDK_SDKManagerWrap } } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int OpenWeb(IntPtr L) + { + try + { + ToLua.CheckArgsCount(L, 2); + SDK.SDKManager obj = (SDK.SDKManager)ToLua.CheckObject(L, 1); + string arg0 = ToLua.CheckString(L, 2); + obj.OpenWeb(arg0); + return 0; + } + catch (Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int CaptureShot(IntPtr L) {