diff --git a/Assets/Scripts/Common/GameLaunch/GameLaunchManager.cs b/Assets/Scripts/Common/GameLaunch/GameLaunchManager.cs index 250e41f1b..8054be76b 100644 --- a/Assets/Scripts/Common/GameLaunch/GameLaunchManager.cs +++ b/Assets/Scripts/Common/GameLaunch/GameLaunchManager.cs @@ -65,13 +65,13 @@ namespace BF GameLaunchProcessorBase processor = new LaunchSuccProcessor(); BFMain.IsStandAlone = false; - processor = new FixUpProcessor(processor); - processor = new DownloadUpdateProcessor(processor); - processor = new CalculateDiffProcessor(processor); - processor = new OnGetVersionProcessor(processor); - processor = new RequestVersionProcessor(processor); - processor = new PreCheckProcessor(processor); - processor = new FirstABProcessor(processor); + // processor = new FixUpProcessor(processor); + // processor = new DownloadUpdateProcessor(processor); + // processor = new CalculateDiffProcessor(processor); + // processor = new OnGetVersionProcessor(processor); + // processor = new RequestVersionProcessor(processor); + // processor = new PreCheckProcessor(processor); + // processor = new FirstABProcessor(processor); processor = new PrepareProcessor(processor); processor.Process(LaunchRequester); #else diff --git a/Assets/Scripts/Common/SDK/BFThirdReportSDKManager.cs b/Assets/Scripts/Common/SDK/BFThirdReportSDKManager.cs index 6f916408d..652c8cce2 100644 --- a/Assets/Scripts/Common/SDK/BFThirdReportSDKManager.cs +++ b/Assets/Scripts/Common/SDK/BFThirdReportSDKManager.cs @@ -19,114 +19,114 @@ namespace BF public void Init() { BFLog.Log("TASdk.Init"); - TASdk.Init(); - AFSdk.Init(); + // TASdk.Init(); + // AFSdk.Init(); } // 设置账户id public void SetThinkingAnalyticsAccountId(string id) { - TASdk.SetAccountId(id); + // TASdk.SetAccountId(id); } // 清除账户id public void ClearThinkingAnalyticsAccountId() { - TASdk.ClearAccountId(); + // TASdk.ClearAccountId(); } // 数数科技上报 // lua端使用 public void PostThinkingAnalyticsEvent(string eventName, string data = "") { - if (string.IsNullOrEmpty(data)) - { - TASdk.Track(eventName, null); - } - else - { - var properties = JsonConvert.DeserializeObject>(data); - TASdk.Track(eventName, properties); - } + // if (string.IsNullOrEmpty(data)) + // { + // TASdk.Track(eventName, null); + // } + // else + // { + // var properties = JsonConvert.DeserializeObject>(data); + // TASdk.Track(eventName, properties); + // } } // 数数科技上报 // c#端使用,只上报事件名 public void PostThinkingAnalyticsEventName(string eventName) { - TASdk.Track(eventName, null); + // TASdk.Track(eventName, null); } // 数数科技上报 // c#端使用,上报事件名和参数 public void PostThinkingAnalyticsEventProperties(string eventName, Dictionary properties) { - TASdk.Track(eventName, properties); + // TASdk.Track(eventName, properties); } public void PostAppsflyerEvent(string eventName, string data = "") { - if (string.IsNullOrEmpty(data)) - { - AFSdk.SendEvent(eventName, null); - } - else - { - var properties = JsonConvert.DeserializeObject>(data); - AFSdk.SendEvent(eventName, properties); - } + // if (string.IsNullOrEmpty(data)) + // { + // AFSdk.SendEvent(eventName, null); + // } + // else + // { + // var properties = JsonConvert.DeserializeObject>(data); + // AFSdk.SendEvent(eventName, properties); + // } } public void PostFireBaseEvent(string eventName, string data = "") { - if (string.IsNullOrEmpty(data)) - { - return; - } - else - { - BFMain.Instance.SDKMgr.BFNativeSDKMgr.LogEvent(eventName, data); - } + // if (string.IsNullOrEmpty(data)) + // { + // return; + // } + // else + // { + // BFMain.Instance.SDKMgr.BFNativeSDKMgr.LogEvent(eventName, data); + // } } // 设置账户id public void PostAdjustSimpleTrackEvent(string key) { - AdjustEvent adjustEvent = new AdjustEvent(key); - // BFLog.Log("PostAdjustSimpleTrackEvent"); - Adjust.trackEvent(adjustEvent); + // AdjustEvent adjustEvent = new AdjustEvent(key); + // // BFLog.Log("PostAdjustSimpleTrackEvent"); + // Adjust.trackEvent(adjustEvent); } public void PostAdjustRevenueTrackEvent(string key, double currency, string currencyCode) { - AdjustEvent adjustEvent = new AdjustEvent(key); - adjustEvent.setRevenue(currency, currencyCode); - // BFLog.Log("PostAdjustRevenueTrackEvent"); - Adjust.trackEvent(adjustEvent); + // AdjustEvent adjustEvent = new AdjustEvent(key); + // adjustEvent.setRevenue(currency, currencyCode); + // // BFLog.Log("PostAdjustRevenueTrackEvent"); + // Adjust.trackEvent(adjustEvent); } public void PostAdjustCallbackTrackEvent(string key, string data = "") { - var properties = JsonConvert.DeserializeObject>(data); - AdjustEvent adjustEvent = new AdjustEvent(key); - foreach (var item in properties) - { - adjustEvent.addCallbackParameter(item.Key, item.Value); - } - // BFLog.Log("PostAdjustCallbackTrackEvent"); - Adjust.trackEvent(adjustEvent); + // var properties = JsonConvert.DeserializeObject>(data); + // AdjustEvent adjustEvent = new AdjustEvent(key); + // foreach (var item in properties) + // { + // adjustEvent.addCallbackParameter(item.Key, item.Value); + // } + // // BFLog.Log("PostAdjustCallbackTrackEvent"); + // Adjust.trackEvent(adjustEvent); } public void PostAdjustPartnerTrackEvent(string key, string data = "") { - var properties = JsonConvert.DeserializeObject>(data); - AdjustEvent adjustEvent = new AdjustEvent(key); - foreach (var item in properties) - { - adjustEvent.addPartnerParameter(item.Key, item.Value); - } - // BFLog.Log("PostAdjustPartnerTrackEvent"); - Adjust.trackEvent(adjustEvent); + // var properties = JsonConvert.DeserializeObject>(data); + // AdjustEvent adjustEvent = new AdjustEvent(key); + // foreach (var item in properties) + // { + // adjustEvent.addPartnerParameter(item.Key, item.Value); + // } + // // BFLog.Log("PostAdjustPartnerTrackEvent"); + // Adjust.trackEvent(adjustEvent); } } } diff --git a/Assets/arts/animations/ui/ani_node.meta b/Assets/arts/animations/ui/ani_node.meta new file mode 100644 index 000000000..a1dbecc35 --- /dev/null +++ b/Assets/arts/animations/ui/ani_node.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ebea9c652439f444d9322b88e7a07d39 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/animations/ui/ani_node/ani_node.controller b/Assets/arts/animations/ui/ani_node/ani_node.controller new file mode 100644 index 000000000..556248901 --- /dev/null +++ b/Assets/arts/animations/ui/ani_node/ani_node.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8780026790104688931 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 0d9098c661b38744081535d674ca6594, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ani_node + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 8601992120933031547} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &8601992120933031547 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -8780026790104688931} + m_Position: {x: 226.7442, y: 356.0994, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -8780026790104688931} diff --git a/Assets/arts/animations/ui/ani_node/ani_node.controller.meta b/Assets/arts/animations/ui/ani_node/ani_node.controller.meta new file mode 100644 index 000000000..d8776f975 --- /dev/null +++ b/Assets/arts/animations/ui/ani_node/ani_node.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 29eec88da5851364cbf1aa6b953ceec4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/animations/ui/ani_node/idle.anim b/Assets/arts/animations/ui/ani_node/idle.anim new file mode 100644 index 000000000..e34b49709 --- /dev/null +++ b/Assets/arts/animations/ui/ani_node/idle.anim @@ -0,0 +1,873 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: idle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.8333333 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_PositionCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1.2, y: 0.8, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.1 + value: {x: 0.8, y: 1.2, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.23333333 + value: {x: 1.1, y: 0.8, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.33333334 + value: {x: 0.8, y: 1.1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.43333334 + value: {x: 1.1, y: 0.8, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.53333336 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6 + value: {x: 1.1, y: 0.8, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.8333333 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: ani_node + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -4.8 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 9.4 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: -6.6 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: -0.5999985 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6 + value: -0.5999985 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: ani_node + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -4.2 + inSlope: 47.429104 + outSlope: 47.429104 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.27049428 + - serializedVersion: 3 + time: 0.1 + value: -0.79999924 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: -3 + inSlope: -44.520493 + outSlope: -44.520493 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.19849314 + - serializedVersion: 3 + time: 0.33333334 + value: -10.8 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: -9 + inSlope: 36 + outSlope: 36 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.53333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6 + value: -9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: + classID: 224 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 2473163045 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2473163045 + attribute: 538195251 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 538195251 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.8333333 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 0.8 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 1.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.8 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: 1.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.53333336 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6 + value: 1.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: ani_node + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.8 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 1.2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0.8 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 1.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: 0.8 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.53333336 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6 + value: 0.8 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: ani_node + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.53333336 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: ani_node + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -4.8 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 9.4 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: -6.6 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: -0.5999985 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6 + value: -0.5999985 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: ani_node + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -4.2 + inSlope: 47.429104 + outSlope: 47.429104 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.27049428 + - serializedVersion: 3 + time: 0.1 + value: -0.79999924 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: -3 + inSlope: -44.520493 + outSlope: -44.520493 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.19849314 + - serializedVersion: 3 + time: 0.33333334 + value: -10.8 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: -9 + inSlope: 36 + outSlope: 36 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.53333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6 + value: -9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: + classID: 224 + script: {fileID: 0} + m_EulerEditorCurves: + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: + classID: 224 + script: {fileID: 0} + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/arts/animations/ui/ani_node/idle.anim.meta b/Assets/arts/animations/ui/ani_node/idle.anim.meta new file mode 100644 index 000000000..f36546b9e --- /dev/null +++ b/Assets/arts/animations/ui/ani_node/idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0d9098c661b38744081535d674ca6594 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index 9e968de32..2083c9d19 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -81,6 +81,7 @@ SpriteAtlas: - {fileID: 21300000, guid: b8056a6868f41394c95a779ca9ccc217, type: 3} - {fileID: 21300000, guid: 1f0e6d68246796849961cb0680d4f226, type: 3} - {fileID: 21300000, guid: 7e9c0788fba4a824f9213b892c30a542, type: 3} + - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3} - {fileID: 21300000, guid: 7cc4f1e808d2d6c45a721ee91ea63866, type: 3} - {fileID: 21300000, guid: dd9f53f83308a3a4799e84f5ccc9fd79, type: 3} - {fileID: 21300000, guid: 1bf9c73960324d3439e0db7c0390d805, type: 3} @@ -126,6 +127,7 @@ SpriteAtlas: - common_title_5 - common_title_4 - common_dec_2 + - common_toast_1 - common_board_5 - common_board_4 - common_bg_2 diff --git a/Assets/arts/textures/icon/hero/hero_fragment.png b/Assets/arts/textures/icon/hero/hero_fragment.png index af96012eb..fccda45f2 100644 Binary files a/Assets/arts/textures/icon/hero/hero_fragment.png and b/Assets/arts/textures/icon/hero/hero_fragment.png differ diff --git a/Assets/arts/textures/ui/common/common_toast_1.png b/Assets/arts/textures/ui/common/common_toast_1.png new file mode 100644 index 000000000..af69ee381 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_toast_1.png differ diff --git a/Assets/arts/textures/ui/common/common_toast_1.png.meta b/Assets/arts/textures/ui/common/common_toast_1.png.meta new file mode 100644 index 000000000..9008bb4e5 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_toast_1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 56c233d89e320ac4891f34a6706ffc0c +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 + vTOnly: 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + 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/lua/app/module/battle/battle_const.lua.bytes b/Assets/lua/app/module/battle/battle_const.lua.bytes index e18ed3680..3275deb2f 100644 Binary files a/Assets/lua/app/module/battle/battle_const.lua.bytes and b/Assets/lua/app/module/battle/battle_const.lua.bytes differ diff --git a/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes b/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes index 55877d6b9..40c784915 100644 Binary files a/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes and b/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes b/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes index 27f952af5..a4402a592 100644 Binary files a/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes and b/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes b/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes index d5eaebe73..facfaba09 100644 Binary files a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes and b/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes differ diff --git a/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes b/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes index 84c820cc9..625f78848 100644 Binary files a/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes and b/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes differ diff --git a/Assets/prefabs/ui/common/reward_cell.prefab b/Assets/prefabs/ui/common/reward_cell.prefab index 7bf0aa7e8..7a1fffbc4 100644 --- a/Assets/prefabs/ui/common/reward_cell.prefab +++ b/Assets/prefabs/ui/common/reward_cell.prefab @@ -30,6 +30,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3335062103840720553} + - {fileID: 4089771124753005517} - {fileID: 5164977974539208548} - {fileID: 7171483589642333812} m_Father: {fileID: 2568998946116628564} @@ -108,7 +109,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5993802040676866955} - m_RootOrder: 2 + 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} @@ -303,6 +304,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4940665596048500704 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4089771124753005517} + - component: {fileID: 2123021332735512846} + - component: {fileID: 5978744269033148093} + m_Layer: 0 + m_Name: fragment + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4089771124753005517 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4940665596048500704} + 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: 5993802040676866955} + 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: 49, y: 51} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2123021332735512846 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4940665596048500704} + m_CullTransparentMesh: 1 +--- !u!114 &5978744269033148093 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4940665596048500704} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 063945c3b6adee543ada4d5f7cdd0a26, 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!1 &6717709196054680970 GameObject: m_ObjectHideFlags: 0 @@ -378,6 +454,10 @@ MonoBehaviour: hashName: 433738181 objectType: 0 gameObject: {fileID: 3441384696332212169} + - name: reward_cell.item_bg.fragment + hashName: 2860980393 + objectType: 0 + gameObject: {fileID: 4940665596048500704} --- !u!225 &6876715644725703649 CanvasGroup: m_ObjectHideFlags: 0 @@ -461,7 +541,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5993802040676866955} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} diff --git a/Assets/prefabs/ui/common/toast.prefab b/Assets/prefabs/ui/common/toast.prefab index f92f61184..5577b5270 100644 --- a/Assets/prefabs/ui/common/toast.prefab +++ b/Assets/prefabs/ui/common/toast.prefab @@ -143,13 +143,13 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4288474879 + rgba: 4294967295 m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 @@ -167,8 +167,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 30 - m_fontSizeBase: 30 + m_fontSize: 26 + m_fontSizeBase: 26 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -251,7 +251,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 675, y: 54} + m_SizeDelta: {x: 717, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7432493807546788155 CanvasRenderer: @@ -314,7 +314,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} + m_Sprite: {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -421,7 +421,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -445,8 +445,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 30 - m_fontSizeBase: 30 + m_fontSize: 26 + m_fontSizeBase: 26 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -555,7 +555,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -579,8 +579,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 30 - m_fontSizeBase: 30 + m_fontSize: 26 + m_fontSizeBase: 26 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 diff --git a/Assets/prefabs/ui/login/test_login_ui.prefab b/Assets/prefabs/ui/login/test_login_ui.prefab index b4556756f..1a83a3821 100644 --- a/Assets/prefabs/ui/login/test_login_ui.prefab +++ b/Assets/prefabs/ui/login/test_login_ui.prefab @@ -2263,7 +2263,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3064541426395101181 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/prefabs/ui/main_city/main_comp.prefab b/Assets/prefabs/ui/main_city/main_comp.prefab index a32600efb..74133f970 100644 --- a/Assets/prefabs/ui/main_city/main_comp.prefab +++ b/Assets/prefabs/ui/main_city/main_comp.prefab @@ -770,8 +770,8 @@ RectTransform: - {fileID: 8025816768929976513} - {fileID: 1575856854187654445} - {fileID: 4087422622006778137} - - {fileID: 8681719700603255145} - - {fileID: 4560266589993988537} + - {fileID: 4476539665745272622} + - {fileID: 8617031614423649158} - {fileID: 2727212828609168601} m_Father: {fileID: 4165930251451731960} m_RootOrder: 1 @@ -795,7 +795,7 @@ GameObject: - component: {fileID: 7318446381477689555} - component: {fileID: 2844100880881451123} m_Layer: 0 - m_Name: left_arrow + m_Name: btn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -808,16 +808,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3707635594199645405} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 525532066576820098} - m_RootOrder: 3 + m_Father: {fileID: 4476539665745272622} + 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: -207, y: 206} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 35, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8919033784330892681 @@ -1204,6 +1204,78 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4742873393291136049 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4476539665745272622} + m_Layer: 5 + m_Name: left_arrow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4476539665745272622 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4742873393291136049} + 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: 8681719700603255145} + m_Father: {fileID: 525532066576820098} + 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: -207, y: 206} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4905415863173620700 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8617031614423649158} + m_Layer: 5 + m_Name: right_arrow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8617031614423649158 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4905415863173620700} + 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: 4560266589993988537} + m_Father: {fileID: 525532066576820098} + m_RootOrder: 4 + 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: 207, y: 206} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6095896065838076103 GameObject: m_ObjectHideFlags: 0 @@ -1426,7 +1498,7 @@ GameObject: - component: {fileID: 8844149722544286727} - component: {fileID: 3742443543419394879} m_Layer: 0 - m_Name: right_arrow + m_Name: btn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1439,16 +1511,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6170108749646449060} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 525532066576820098} - m_RootOrder: 4 + m_Father: {fileID: 8617031614423649158} + 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: 207, y: 206} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 42, y: 63} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3591002375974964181 @@ -2243,12 +2315,12 @@ MonoBehaviour: hashName: 575830526 objectType: 0 gameObject: {fileID: 7610464833581059204} - - name: main_comp.chapter.left_arrow - hashName: 3316233931 + - name: main_comp.chapter.left_arrow.btn + hashName: 3642867897 objectType: 0 gameObject: {fileID: 3707635594199645405} - - name: main_comp.chapter.right_arrow - hashName: 1179587180 + - name: main_comp.chapter.right_arrow.btn + hashName: 2323538906 objectType: 0 gameObject: {fileID: 6170108749646449060} - name: main_comp.hero_bg.hero_cell_1 @@ -2307,6 +2379,14 @@ MonoBehaviour: hashName: 758829150 objectType: 0 gameObject: {fileID: 6122668536964791755} + - name: main_comp.chapter.left_arrow + hashName: 3316233931 + objectType: 0 + gameObject: {fileID: 4742873393291136049} + - name: main_comp.chapter.right_arrow + hashName: 1179587180 + objectType: 0 + gameObject: {fileID: 4905415863173620700} --- !u!114 &6214590949040345325 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2863,16 +2943,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 471a678dc340f4f43b842474749cf0df, type: 3} ---- !u!1 &4185139740795901483 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: 471a678dc340f4f43b842474749cf0df, type: 3} - m_PrefabInstance: {fileID: 7435023522691564449} - m_PrefabAsset: {fileID: 0} --- !u!224 &4938311815031829493 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} m_PrefabInstance: {fileID: 7435023522691564449} m_PrefabAsset: {fileID: 0} +--- !u!1 &4185139740795901483 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: 471a678dc340f4f43b842474749cf0df, type: 3} + m_PrefabInstance: {fileID: 7435023522691564449} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8704992128231832206 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/prefabs/ui/tips/rewards_tips.prefab b/Assets/prefabs/ui/tips/rewards_tips.prefab index b984669f9..f427e1c25 100644 --- a/Assets/prefabs/ui/tips/rewards_tips.prefab +++ b/Assets/prefabs/ui/tips/rewards_tips.prefab @@ -188,8 +188,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4290217278 - m_fontColor: {r: 0.24313726, g: 0.52156866, b: 0.7176471, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -206,8 +206,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 22 - m_fontSizeBase: 22 + m_fontSize: 26 + m_fontSizeBase: 26 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 diff --git a/Assets/scenes/enter_scene.unity b/Assets/scenes/enter_scene.unity index aec74d48b..c786ed381 100644 --- a/Assets/scenes/enter_scene.unity +++ b/Assets/scenes/enter_scene.unity @@ -166,37 +166,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &575176999 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 575608007} - 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: 895727639} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &575608007 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 575176999} - - component: {fileID: 114179902946241615} - m_Layer: 0 - m_Name: Adjust - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &746484812 GameObject: m_ObjectHideFlags: 0 @@ -243,8 +212,8 @@ MonoBehaviour: enableLog: 0 networkType: 1 tokens: - - appid: 2b71847a8bac4b189498ca6d342f2361 - serverUrl: https://ta.perfeggsgame.com + - appid: + serverUrl: mode: 0 timeZone: 1 timeZoneId: @@ -291,7 +260,6 @@ Transform: m_Children: - {fileID: 7837453217150055407} - {fileID: 2135676059} - - {fileID: 575176999} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -412,43 +380,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 82373aa8a491d4a438885616eff312dc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &114179902946241615 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 575608007} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 525ece82a472e4dea837e1ef938fd15d, type: 3} - m_Name: - m_EditorClassIdentifier: - startManually: 0 - appToken: 30184pcl58g0 - environment: 1 - logLevel: 3 - eventBuffering: 0 - sendInBackground: 0 - launchDeferredDeeplink: 1 - needsCost: 0 - coppaCompliant: 0 - linkMe: 0 - defaultTracker: - urlStrategy: 0 - startDelay: 0 - secretId: 0 - info1: 0 - info2: 0 - info3: 0 - info4: 0 - preinstallTracking: 0 - preinstallFilePath: - playStoreKidsApp: 0 - iadInfoReading: 1 - adServicesInfoReading: 1 - idfaInfoReading: 1 - skAdNetworkHandling: 1 --- !u!114 &559920982733111998 MonoBehaviour: m_ObjectHideFlags: 0 @@ -461,7 +392,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2a2ec6ba1ee8b48749524f015ed572a6, type: 3} m_Name: m_EditorClassIdentifier: - devKey: 2kw5DjPegQAvD3dRVFsQuK + devKey: iosDevKey: appID: UWPAppID: