diff --git a/Assets/Resources/Image/UI/Btn_MoreGame.png b/Assets/Resources/Image/UI/Btn_MoreGame.png new file mode 100644 index 00000000..ceb5e14b Binary files /dev/null and b/Assets/Resources/Image/UI/Btn_MoreGame.png differ diff --git a/Assets/Resources/Image/UI/Btn_MoreGame.png.meta b/Assets/Resources/Image/UI/Btn_MoreGame.png.meta new file mode 100644 index 00000000..16f6645b --- /dev/null +++ b/Assets/Resources/Image/UI/Btn_MoreGame.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: a830a8f5789654166954641b96a1515d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Image/UI/Btn_Privacy.png b/Assets/Resources/Image/UI/Btn_Privacy.png index 6603f820..9caaf5a8 100644 Binary files a/Assets/Resources/Image/UI/Btn_Privacy.png and b/Assets/Resources/Image/UI/Btn_Privacy.png differ diff --git a/Assets/Resources/Image/UI/Btn_UserPolicy.png b/Assets/Resources/Image/UI/Btn_UserPolicy.png new file mode 100644 index 00000000..eb25ba0c Binary files /dev/null and b/Assets/Resources/Image/UI/Btn_UserPolicy.png differ diff --git a/Assets/Resources/Image/UI/Btn_UserPolicy.png.meta b/Assets/Resources/Image/UI/Btn_UserPolicy.png.meta new file mode 100644 index 00000000..43b71ade --- /dev/null +++ b/Assets/Resources/Image/UI/Btn_UserPolicy.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: b37aa9e19b776403a96d896c42e62de8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UIs/PanelGame.prefab b/Assets/Resources/UIs/PanelGame.prefab index 898b5168..5b28dc73 100644 --- a/Assets/Resources/UIs/PanelGame.prefab +++ b/Assets/Resources/UIs/PanelGame.prefab @@ -3688,7 +3688,7 @@ RectTransform: - {fileID: 52328724596965022} - {fileID: 52328725587133165} m_Father: {fileID: 6887168215975438127} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -4222,6 +4222,7 @@ RectTransform: - {fileID: 5298792262185626490} - {fileID: 6887168215666545458} - {fileID: 1191926877137459994} + - {fileID: 4887892062626000050} - {fileID: 6887168216566812254} - {fileID: 6887168216751100237} - {fileID: 6887168215662265960} @@ -4493,6 +4494,7 @@ MonoBehaviour: m_EditorClassIdentifier: mLvOpening: {fileID: 1836093682761944328} mTxtTitle: {fileID: 6887168215666545457} + mBtnMoreGame: {fileID: 4037435261139834824} mBtnLevel: {fileID: 6887168216566812252} mBtnMenu: {fileID: 6887168216751100227} mBtnEndings: {fileID: 2431990845248124856} @@ -4579,7 +4581,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6887168215975438127} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -4793,7 +4795,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6887168215975438127} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -5731,6 +5733,157 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8460662659816252849 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4887892062626000050} + - component: {fileID: 3059516903532499323} + - component: {fileID: 168983668239877765} + - component: {fileID: 4037435261139834824} + - component: {fileID: 5743929752218311984} + - component: {fileID: 5299563837057959381} + m_Layer: 5 + m_Name: Btn_MoreGame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4887892062626000050 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8460662659816252849} + 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: 6887168215975438127} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -210, y: -120} + m_SizeDelta: {x: 83, y: 87} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3059516903532499323 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8460662659816252849} + m_CullTransparentMesh: 0 +--- !u!114 &168983668239877765 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8460662659816252849} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: a830a8f5789654166954641b96a1515d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4037435261139834824 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8460662659816252849} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 168983668239877765} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!95 &5743929752218311984 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8460662659816252849} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 7c5794036b4624dd7a0d12e3ceb6bb4a, 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 &5299563837057959381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8460662659816252849} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 791356b2c7d5c444980c1472ffa8f1ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &9146214338938509918 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UIs/PanelMain.prefab b/Assets/Resources/UIs/PanelMain.prefab index 4226cbf0..db1fb858 100644 --- a/Assets/Resources/UIs/PanelMain.prefab +++ b/Assets/Resources/UIs/PanelMain.prefab @@ -1191,6 +1191,7 @@ MonoBehaviour: mBtnStart: {fileID: 6938199817936171397} mBtnLevel: {fileID: 6938199816655478211} mBtnPrivacy: {fileID: 6938199817158992780} + mBtnUserPolicy: {fileID: 3128230292117884285} mGobOpMask: {fileID: 4549264264439244429} --- !u!114 &6938199816757883050 MonoBehaviour: @@ -1360,8 +1361,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -40} - m_SizeDelta: {x: 168, y: 63} + m_AnchoredPosition: {x: 100, y: -40} + m_SizeDelta: {x: 165, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6938199817158992770 CanvasRenderer: @@ -1502,6 +1503,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6938199817158992783} + - {fileID: 3439427058276878894} m_Father: {fileID: 6938199817457093812} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2002,6 +2004,157 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6962667667061014056 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3439427058276878894} + - component: {fileID: 2728360139835251258} + - component: {fileID: 1125055376263307392} + - component: {fileID: 3128230292117884285} + - component: {fileID: 127829721890062764} + - component: {fileID: 781082510052664357} + m_Layer: 5 + m_Name: Btn_UserPolicy + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3439427058276878894 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6962667667061014056} + 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: 6938199817420532152} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -100, y: -40} + m_SizeDelta: {x: 165, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2728360139835251258 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6962667667061014056} + m_CullTransparentMesh: 0 +--- !u!114 &1125055376263307392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6962667667061014056} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b37aa9e19b776403a96d896c42e62de8, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3128230292117884285 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6962667667061014056} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1125055376263307392} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!95 &127829721890062764 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6962667667061014056} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 7c5794036b4624dd7a0d12e3ceb6bb4a, 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 &781082510052664357 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6962667667061014056} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 791356b2c7d5c444980c1472ffa8f1ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7674450576922989318 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/ToukaGames/Common/Singleton/ToukaUtils.cs b/Assets/Scripts/ToukaGames/Common/Singleton/ToukaUtils.cs index c7c79662..76ec498c 100644 --- a/Assets/Scripts/ToukaGames/Common/Singleton/ToukaUtils.cs +++ b/Assets/Scripts/ToukaGames/Common/Singleton/ToukaUtils.cs @@ -19,6 +19,11 @@ public static class ToukaUtils Application.OpenURL("http://www.toukagame.com/PrivacyPolicy.html"); } + public static void OpenUserPolicy() + { + Application.OpenURL("https://www.toukagame.com/agreement.html"); + } + /// /// 打开更多游戏 - 跳转appstore公司账号页面 /// @@ -274,4 +279,45 @@ public static class ToukaUtils return false; } } + + public static string GetTodayDataStr() + { + string timeStr = DateTime.Now.ToString("yyyy-MM-dd"); + return timeStr; + } + + public static void CheckPassLvAndAdEvent(int pLvNum) + { + Debug.Log("is first day ==: " + ToukaUtilsInner.Instance.isFirstDayLogin); + Debug.Log("pass lv count ==: " + pLvNum); + if (ToukaUtilsInner.Instance.isFirstDayLogin && pLvNum >= int.Parse(StaticOnlineParams.NewUserPassXLevelOnlineParams.DefaultValue)) + { + string tPassLvKey = "PassLv_Log"; + if (IfFirstCheckPlayerPrefs(tPassLvKey)) + { + ToukaAnalyticsManager.Instance.LogEvent(ToukaLogType.Tenjin, StaticStringsEvent.Event_Tenjin_TKInner_NewUserPassLevelX); + ToukaAnalyticsManager.Instance.LogEventByUmeng(StaticStringsEvent.Event_Tenjin_TKInner_NewUserPassLevelX); + } + + CheckAdCount(); + } + } + + private static void CheckAdCount() + { + var videoCount = GetPlayerPrefsIntByKey(StaticStringsPlayerPrefs.VideoShowCount); + var intersitialCount = GetPlayerPrefsIntByKey(StaticStringsPlayerPrefs.IntersitialShowCount); + string tLvAndAdKey = "PassLv&AdCount_Log"; + string tEvtPassLvAndAdCount = "Passlevel&Count_Video"; + + Debug.Log("watch ad count ==: " + (videoCount + intersitialCount)); + if ((videoCount + intersitialCount) >= int.Parse(StaticOnlineParams.NewUserAdsCountOnlineParams.DefaultValue)) + { + if (IfFirstCheckPlayerPrefs(tLvAndAdKey)) + { + ToukaAnalyticsManager.Instance.LogEvent(ToukaLogType.Tenjin, tEvtPassLvAndAdCount); + ToukaSDKManager.Instance.LogEventByUmeng(tEvtPassLvAndAdCount); + } + } + } } \ No newline at end of file diff --git a/Assets/Scripts/UI/PanelGame.cs b/Assets/Scripts/UI/PanelGame.cs index f536582c..2bdfcedc 100644 --- a/Assets/Scripts/UI/PanelGame.cs +++ b/Assets/Scripts/UI/PanelGame.cs @@ -12,6 +12,7 @@ public class PanelGame : BasePanel [SerializeField] LevelOpening mLvOpening; [SerializeField] Text mTxtTitle; + [SerializeField] Button mBtnMoreGame; [SerializeField] Button mBtnLevel; [SerializeField] Button mBtnMenu; [SerializeField] ButtonEndings mBtnEndings; @@ -39,6 +40,7 @@ public class PanelGame : BasePanel private void Awake() { + UIUtils.BindBtn(mBtnMoreGame, OnClickMoreGame); UIUtils.BindBtn(mBtnLevel, OnClickLevel, AudioClipType.Click_Normal); UIUtils.BindBtn(mBtnMenu, OnClickMenu, AudioClipType.Click_Tip); UIUtils.BindBtn(mBtnPlay, OnClickPlay, AudioClipType.Click_Play); @@ -113,6 +115,11 @@ public class PanelGame : BasePanel TimerManager.Instance.Schedule(() => mGobChooseTip.SetActive(true), 0.5f); } + private void OnClickMoreGame() + { + ToukaUtils.OpenMoreGames(); + } + private void OnClickLevel() { PanelLevel tUILevel = UIManager.Instance.OpenUI(); diff --git a/Assets/Scripts/UI/PanelMain.cs b/Assets/Scripts/UI/PanelMain.cs index c216cf25..40e12cda 100644 --- a/Assets/Scripts/UI/PanelMain.cs +++ b/Assets/Scripts/UI/PanelMain.cs @@ -31,6 +31,7 @@ public class PanelMain : BasePanel [SerializeField] Button mBtnLevel; [SerializeField] Button mBtnPrivacy; + [SerializeField] Button mBtnUserPolicy; [SerializeField] GameObject mGobOpMask; @@ -68,6 +69,7 @@ public class PanelMain : BasePanel UIUtils.BindBtn(mBtnStart, OnClickStart, AudioClipType.StartGame); UIUtils.BindBtn(mBtnLevel, OnClickLevel, AudioClipType.Click_Normal); UIUtils.BindBtn(mBtnPrivacy, OnClickPrivacy); + UIUtils.BindBtn(mBtnUserPolicy, OnClickUserPolicy); } public override void OnOpen() @@ -432,4 +434,9 @@ public class PanelMain : BasePanel { ToukaUtils.OpenPrivacyURL(); } + + private void OnClickUserPolicy() + { + ToukaUtils.OpenUserPolicy(); + } } \ No newline at end of file