Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

7 天以前 243044702c6a743e57d322e5ca538d9897919026

Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

 Main/Common/EventName.cs

@@ -13,7 +13,7 @@
    public const string BATTLE_DROP_ITEMS = "BATTLE_DROP_ITEMS";//掉落物品

    public const string BATTLE_CAST_SKILL = "BATTLE_CAST_SKILL";//施放技能
	
    public const string BATTLE_START = "BATTLE_START";//战斗初始化
    public const string BATTLE_END = "BATTLE_END";//战斗结束
    public const string RECORDPLAYER_END = "RECORDPLAYER_END"; //战斗小片段结束


 Main/Component/UI/Common/GroupButtonEx.cs

@@ -71,8 +71,8 @@
        set { this.m_Title = value; }
    }

    [SerializeField] TextEx m_TitleOutline;
    public TextEx titleOutline
    [SerializeField] OutlineEx m_TitleOutline;
    public OutlineEx titleOutline
    {
        get { return this.m_TitleOutline; }
        set { this.m_TitleOutline = value; }
@@ -157,7 +157,7 @@

        if (m_TitleOutline != null && m_Manager != null)
        {
            m_TitleOutline.color = m_Manager.GetOutlineColorForState(m_State);
            m_TitleOutline.OutlineColor = m_Manager.GetOutlineColorForState(m_State);
        }

        if (m_SelectEffect != null)

 Main/Core/GameEngine/Launch/InitSettingTask.cs

@@ -15,7 +15,8 @@
        ShaderUtility.InitGlobalParams();
        // SoundPlayer.CreateSoundPlayer();
        SoundPlayer.Instance.Init();
        //SoundPlayer.Instance.PlayLoginMusic();
        SoundPlayer.Instance.PlayLoginMusic();
        // SoundPlayer.Instance.PlayBackGroundMusic(41);

        SystemSetting.Instance.SetSoundVolume(SystemSetting.Instance.GetSoundVolume());
        SystemSetting.Instance.SetSoundEffect(SystemSetting.Instance.GetSoundEffect());

 Main/Core/GameEngine/Launch/RequestPermissionStart.cs

@@ -5,24 +5,29 @@

    public override void Begin()
    {
#if UNITY_EDITOR
        done = true;
        LocalSave.SetBool("secretToggleStart5", true);
#endif
// #if UNITY_EDITOR
//         done = true;
//         LocalSave.SetBool("secretToggleStart5", true);
// #endif

        if (LocalSave.GetBool("secretToggleStart5"))
        {
            SDKUtils.Instance.IsAgreeSecret = true;
        // if (LocalSave.GetBool("secretToggleStart5"))
        // {
        //     SDKUtils.Instance.IsAgreeSecret = true;
        //     SDKUtils.Instance.RequestAndroidPermissionStart();
        // }
        // else
        // {
        //     //先弹隐私政策，同意之后才可以申请权限 继续游戏
        //     // UIManager.Instance.OpenWindow<RequestSecretWin>();

        //     //改成向SDK请求隐私权限
        //     SDKUtils.Instance.RequestSecretRule();
        // }

        //到这里一定是同意隐私，纯安卓处理
        LocalSave.SetBool("PrivacyAcceptedKey", true);
            SDKUtils.Instance.RequestAndroidPermissionStart();
        }
        else
        {
            //先弹隐私政策，同意之后才可以申请权限 继续游戏
            // UIManager.Instance.OpenWindow<RequestSecretWin>();

            //改成向SDK请求隐私权限
            SDKUtils.Instance.RequestSecretRule();
        }
        SDKUtils.Instance.IsAgreeSecret = true;
    }

    public override void End()

 Main/Manager/StageManager.cs

@@ -51,7 +51,7 @@


        UIManager.Instance.OpenWindow<LaunchBackGroundWin>();

        UIManager.Instance.OpenWindow<LoginWin>();

        SoundPlayer.Instance.StopBackGroundMusic();

        // SoundPlayer.Instance.StopBackGroundMusic();



        if (VersionUtility.Instance.NeedDownAsset() && !AssetVersionUtility.hasDownLoadFullAsset)

        {

@@ -78,7 +78,8 @@
        {

            UIManager.Instance.OpenWindow<ServerForceExitHintWin>();

        }

        SoundPlayer.Instance.StopBackGroundMusic();

        // SoundPlayer.Instance.StopBackGroundMusic();

        SoundPlayer.Instance.PlayLoginMusic();

    }



    protected float GetManagerRequestDataProgress()

@@ -114,7 +115,7 @@
        {

            AssetBundleUtility.Instance.Sync_LoadAll("maps/Game");

        }



        SoundPlayer.Instance.StopBackGroundMusic();

        AsyncOperation asyncOperation = SceneManager.LoadSceneAsync("Game");



        await OnLoading(asyncOperation, () => (DTC0403_tagPlayerLoginLoadOK.finishedLogin ? .5f : 0f) + GetManagerRequestDataProgress() * .5f);


 Main/ResModule/BuiltInLoader.cs

@@ -88,7 +88,7 @@
        if (!AssetSource.isUseAssetBundle)
        {
#if UNITY_EDITOR
            var path = StringUtility.Concat("Assets/ResourcesOut/BuiltIn/Musics/", name, AUDIO_EXTENSION);
            var path = StringUtility.Concat("Assets/ResourcesOut/BuiltIn/Musics/", name, ".mp3");
            audioClip = UnityEditor.AssetDatabase.LoadAssetAtPath<AudioClip>(path);
#endif
        }

 Main/SDK/SDKUtils.cs

@@ -520,6 +520,7 @@
                }
            case CodeA2U.SecretRuleOK:
                {
                    // 纯android处理，这里触发不到了
                    IsAgreeSecret = true;
                    LocalSave.SetBool("secretToggleStart5", true);
                    break;

 Main/System/Battle/BattleField/BattleField.cs

@@ -185,6 +185,8 @@
            battleHpRecorder.Add(guid, battleHpRecord);
        }
#endif

        EventBroadcast.Instance.Broadcast<string>(EventName.BATTLE_START, guid);
    }

    private void PreloadResources(List<TeamBase> redTeamList, List<TeamBase> blueTeamList)

 Main/System/Launch/LaunchWin.cs

@@ -17,8 +17,8 @@
        // [SerializeField] Image m_BackGround;
        [SerializeField] RectTransform m_AndroidProgressContainer;
        [SerializeField] RectTransform m_NetworkContainer;
        [SerializeField] SmoothSlider m_PartProgressSlider;
        [SerializeField] SmoothSlider m_TotalProgressSlider;
    // [SerializeField] SmoothSlider m_PartProgressSlider;
    [SerializeField] Slider m_TotalProgressSlider;
        [SerializeField] Text m_StageDescription;
        [SerializeField] RectTransform m_IosProgressContainer;
        [SerializeField] Text m_IosProgressTip;
@@ -39,40 +39,18 @@
        int WaitSeconds = 0;
        bool ShowCircleView = false;
        float TempCheck = 0;
        protected override void InitComponent()
        {
            base.InitComponent();
            // m_BackGround.preserveAspect = true;
            // if (Application.isEditor)
            // {
            //     var sprite = BuiltInLoader.LoadSprite("Launch_1");
            //     m_BackGround.overrideSprite = sprite;
            // }
            // else
            // {
            //     for (var i = 0; i < 3; i++)
            //     {
            //         var sprite = BuiltInLoader.LoadSprite(StringUtility.Concat("Launch_", i + 1));
            //         if (sprite != null)
            //         {
            //             backGrounds.Add(sprite);
            //         }
            //     }

            //     m_BackGround.overrideSprite = backGrounds[0];
            // }


        }

        protected override void OnPreOpen()
        {
            base.OnPreOpen();
        UIManager.Instance.OnOpenWindow += OnOpenWindow;
        UIManager.Instance.OnCloseWindow += OnCloseWindow;
            backGroundTimer = 0f;
            backGroundIndex = 0;
            if (m_TotalProgressSlider != null)
            {
                m_TotalProgressSlider.ResetValue(0f);
            m_TotalProgressSlider.value = 0f;
            }

            // m_AlphaTween.SetStartState();
@@ -117,26 +95,37 @@

            UpdateProgress();

            if (m_TotalProgressSlider == null)
            {
                m_TotalProgressSlider = this.GetComponentInChildren<SmoothSlider>(true);
            }
        // if (m_TotalProgressSlider == null)
        // {
        //     m_TotalProgressSlider = this.GetComponentInChildren<SmoothSlider>(true);
        // }
        }

        protected override void OnOpen()
        {
            base.OnOpen();
        }


        protected override void OnPreClose()
        {
            base.OnPreClose();
        UIManager.Instance.OnOpenWindow -= OnOpenWindow;
        UIManager.Instance.OnCloseWindow -= OnCloseWindow;
        }

        protected override void OnClose()
    void OnOpenWindow(UIBase win)
        {
            base.OnClose();
        if (win is DownLoadWin)
        {
            m_AndroidProgressContainer.SetActive(false);
        }
    }

    void OnCloseWindow(UIBase win)
    {
        if (win is DownLoadWin)
        {
            m_AndroidProgressContainer.SetActive(true);
        }
    }


        public void FadeOut()
        {
@@ -220,10 +209,10 @@

                if (progressInfo.stage == LaunchStage.DownLoad)
                {
                    if (m_PartProgressSlider != null && m_PartProgressSlider.gameObject.activeInHierarchy)
                    {
                        m_PartProgressSlider.SetActive(false);
                    }
                // if (m_PartProgressSlider != null && m_PartProgressSlider.gameObject.activeInHierarchy)
                // {
                //     m_PartProgressSlider.SetActive(false);
                // }

                    if (m_TotalProgressSlider != null && m_TotalProgressSlider.gameObject.activeInHierarchy)
                    {
@@ -232,10 +221,10 @@
                }
                else
                {
                    if (m_PartProgressSlider != null && !m_PartProgressSlider.gameObject.activeInHierarchy)
                    {
                        m_PartProgressSlider.SetActive(true);
                    }
                // if (m_PartProgressSlider != null && !m_PartProgressSlider.gameObject.activeInHierarchy)
                // {
                //     m_PartProgressSlider.SetActive(true);
                // }

                    if (m_TotalProgressSlider != null && !m_TotalProgressSlider.gameObject.activeInHierarchy)
                    {
@@ -247,10 +236,10 @@
                        m_TotalProgressSlider.value = progressInfo.totalProgress;
                    }

                    if (m_PartProgressSlider != null)
                    {
                        m_PartProgressSlider.value = progressInfo.partProgress;
                    }
                // if (m_PartProgressSlider != null)
                // {
                //     m_PartProgressSlider.value = progressInfo.partProgress;
                // }
                }

                DisplayStageDescription(progressInfo.stage, progressInfo.step);

 Main/System/Launch/LoadingWin.cs

@@ -11,8 +11,8 @@

    // [SerializeField] UIAlphaTween m_AlphaTween;
    [SerializeField] RawImage m_BackGround;
    [SerializeField] SmoothSlider m_PartProgressSlider;
    [SerializeField] SmoothSlider m_TotalProgressSlider;
    // [SerializeField] SmoothSlider m_PartProgressSlider;
    [SerializeField] Slider m_TotalProgressSlider;
    [SerializeField] Text m_StageDescription;
    [SerializeField] Text m_Version;
    // [SerializeField] Button m_UserHelp;
@@ -92,12 +92,12 @@
        {
            currentProgress = (int)Mathf.Lerp(currentProgress, targetProgress, 0.1f);
            m_TotalProgressSlider.value = currentProgress / 100f;
            m_PartProgressSlider.value = currentProgress / 100f;
            // m_PartProgressSlider.value = currentProgress / 100f;
        }
        else
        {
            m_TotalProgressSlider.value = currentProgress / 100f;
            m_PartProgressSlider.value = currentProgress / 100f;
            // m_PartProgressSlider.value = currentProgress / 100f;
        }
        CopiedLogic_UpdateProgress();
    }

 Main/System/Main/MainWin.cs

@@ -58,6 +58,7 @@
        RenameManager.Instance.OnUpdateRenameResultEvent += OnUpdateRenameResultEvent;
        UIManager.Instance.OnCloseWindow += OnCloseWindow;
        GlobalTimeEvent.Instance.MSEvent += OnMSEvent;
        EventBroadcast.Instance.AddListener<string>(EventName.BATTLE_START, OnBattleStart);
        base.OnPreOpen();

        // 刷新UI
@@ -71,6 +72,7 @@
        RenameManager.Instance.OnUpdateRenameResultEvent -= OnUpdateRenameResultEvent;
        UIManager.Instance.OnCloseWindow -= OnCloseWindow;
        GlobalTimeEvent.Instance.MSEvent -= OnMSEvent;
        EventBroadcast.Instance.RemoveListener<string>(EventName.BATTLE_START, OnBattleStart);

        base.OnPreClose();
        isForcePlayFightUIAnim = true;
@@ -345,7 +347,24 @@
        }
    }

    void OnBattleStart(string guid)
    {
        if (string.IsNullOrEmpty(guid))
        {
            var tmpHero = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero("");
            if (tmpHero != null)
            {
                AutoFightModel.Instance.fightingHeroSkinID = tmpHero.SkinID;
            }
            else
            {
                Debug.LogError("没有找到下一个攻击武将");
                return;
            }

            fightHeroImg.SetOrgSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon, "HeroHead");
        }
    }

    void RefreshFightIng(bool isfighting = false)
    {

 Main/System/MainLevel/MainLevelDropCell.cs

@@ -52,8 +52,15 @@
            }
            int curValue = 0;
            MainLevelManager.Instance.m_DailyBootyDict.TryGetValue(itemID, out curValue);
            if (maxValue > 1000000000)
            {
                dropValueText.text = UIHelper.AppendColor(TextColType.Green, UIHelper.ReplaceLargeNum(curValue) + "/" + Language.Get("L1138"));
            }
            else
            {
            dropValueText.text = UIHelper.AppendColor(curValue >= maxValue ? TextColType.Red : TextColType.Green,
            UIHelper.ReplaceLargeNum(curValue) + "/" + UIHelper.ReplaceLargeNum(maxValue));
            }
            
        }
    }

 Main/System/Sound/SoundPlayer.cs

@@ -355,14 +355,14 @@
        }
    }

    //public void PlayLoginMusic()
    //{
    //    var loginMusic = BuiltInLoader.LoadMusic("Music_Login");
    //    if (!m_MusicAudioSource.isPlaying || m_MusicAudioSource.clip != loginMusic)
    //    {
    //        StartCoroutine(Co_BackGroundMusicFadeOutIn(loginMusic, false));
    //    }
    //}
    public void PlayLoginMusic()
    {
       var loginMusic = BuiltInLoader.LoadMusic("login");
       if (!m_MusicAudioSource.isPlaying || m_MusicAudioSource.clip != loginMusic)
       {
           StartCoroutine(Co_BackGroundMusicFadeOutIn(loginMusic, false));
       }
    }

    //private void LateUpdate()
    //{

 Main/System/UIBase/OneLevelWin.cs

@@ -26,6 +26,8 @@
            tabButtons[i] = go.GetComponent<GroupButtonEx>();
            tabButtons[i].selectIcon.SetSprite(data.iconName);
            tabButtons[i].selectIcon.SetNativeSize();
            tabButtons[i].unSelectIcon.SetSprite(data.unSelectIconName);
            tabButtons[i].unSelectIcon.SetNativeSize();
            tabButtons[i].title.text = Language.Get(data.name);
            tabButtons[i].redpoint.redpointId = data.redpointID;
            tabButtons[i].SetActive(true);
@@ -48,4 +50,5 @@
    public int redpointID;
    public string name;
    public string iconName; //默认显示的图标（选中）
    public string unSelectIconName; //图标（未选中）
}