Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2018-12-06 14cc691f539d15fd0fba2bc8297fb22d80d4d395

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/GameEngine/Model/Config/AncientRobotNameConfig.cs

New file
@@ -0,0 +1,41 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Thursday, December 06, 2018
//--------------------------------------------------------

using UnityEngine;
using System;

namespace TableConfig {

    
    public partial class AncientRobotNameConfig : ConfigBase {

        public int id { get ; private set ; }

        public string Name { get ; private set; } 

        public override string getKey()
        {
            return id.ToString();
        }

        public override void Parse() {
            try
            {
                id=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 
			
                Name = rawContents[1].Trim();
            }
            catch (Exception ex)
            {
                DebugEx.Log(ex);
            }
        }
	
    }

}





 Core/GameEngine/Model/Config/AncientRobotNameConfig.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: b49056d4d67eaff4aa0cbad948b7d5ad
timeCreated: 1544094304
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Core/GameEngine/Model/ConfigManager.cs

@@ -212,6 +212,7 @@
        AddAsyncTask<GodWeaponEffectConfig>();

        AddAsyncTask<DungeonHelpBattleConfig>();

        AddAsyncTask<FuncSwitchConfig>();

        AddAsyncTask<AncientRobotNameConfig>();



        while (!AllCompleted())

        {


 System/Activity/ActivityModel.cs

@@ -146,8 +146,7 @@
            else

            {

                ancientRandomName.Clear();

                firstNameRandoms.Clear();

                secondNameRandoms.Clear();

                nameRandomIndexs.Clear();

            }

        }



@@ -364,8 +363,7 @@
        #endregion



        Dictionary<int, Dictionary<int, string>> ancientRandomName = new Dictionary<int, Dictionary<int, string>>();

        List<int> firstNameRandoms = new List<int>();

        List<int> secondNameRandoms = new List<int>();

        List<int> nameRandomIndexs = new List<int>();

        public string GetAncientRobotName(int objId, int npcId)

        {

            if (ancientRandomName.ContainsKey(objId)

@@ -373,9 +371,17 @@
            {

                return ancientRandomName[objId][npcId];

            }

            var firstName = RandomNameConfig.GetFirstName(ref firstNameRandoms);

            var secondName = RandomNameConfig.GetSecondName(ref secondNameRandoms);

            var name = StringUtility.Contact(firstName, secondName);

            var configs = Config.Instance.GetAllValues<AncientRobotNameConfig>();

            if (nameRandomIndexs.Count == 0)

            {

                for (int i = 0; i < configs.Count; i++)

                {

                    nameRandomIndexs.Add(configs[i].id);

                }

            }

            var index = UnityEngine.Random.Range(0, nameRandomIndexs.Count);

            var name = Config.Instance.Get<AncientRobotNameConfig>(nameRandomIndexs[index]).Name;

            nameRandomIndexs.RemoveAt(index);

            Dictionary<int, string> dict;

            if (!ancientRandomName.ContainsKey(objId))

            {


 System/Rune/RuneModel.cs

@@ -209,7 +209,7 @@
                    _dict = new Dictionary<int, float>();

                    runeAttrResultDict.Add(type, _dict);

                }

                if (params1 == 0)

                if (params1 == 0 && !_dict.ContainsKey(level))

                {

                    Equation.Instance.Clear();

                    Equation.Instance.AddKeyValue(replaceValStr, level);


 System/Treasure/TreasureSelectWin.cs

@@ -33,6 +33,7 @@
        }



        bool m_CorrectClose = false;

        bool rightSelect = true;

        #region Built-in

        protected override void BindController()

        {

@@ -48,6 +49,7 @@
                {

                    return;

                }

                rightSelect = true;

                UI3DTreasureSelectStage.Instance.SelectTreasureCategory(TreasureCategory.Human);

                UpdateButtonState();

            });

@@ -59,6 +61,7 @@
                {

                    return;

                }

                rightSelect = true;

                UI3DTreasureSelectStage.Instance.SelectTreasureCategory(TreasureCategory.Demon);

                UpdateButtonState();

            });

@@ -81,6 +84,18 @@
                CloseImmediately();

                UI3DTreasureSelectStage.Instance.Close();

            });

            m_HumanBtn.repeatClickFunc += () =>

            {

                ReclickSelect(TreasureCategory.Human);

            };

            m_DemonBtn.repeatClickFunc += () =>

            {

                ReclickSelect(TreasureCategory.Demon);

            };

            m_FairyBtn.repeatClickFunc += () =>

            {

                ReclickSelect(TreasureCategory.Fairy);

            };

        }



        protected override void OnPreOpen()

@@ -104,6 +119,7 @@
            UpdateButtonSelect();

            UpdateButtonState();

            m_CorrectClose = false;

            rightSelect = true;

        }



        protected override void OnActived()

@@ -230,6 +246,78 @@
                }, 1.5f);

            }

        }



        private void ReclickSelect(TreasureCategory category)

        {

            if (UI3DTreasureSelectStage.Instance.jumping

                || UI3DTreasureSelectStage.Instance.UnlockShowing || UI3DTreasureSelectStage.Instance.IsCloser

                || UI3DTreasureSelectStage.Instance.treasureFinishShowing)

            {

                return;

            }

            var list = model.GetTreasureCategory(category);

            var gotoId = 0;

            switch (category)

            {

                case TreasureCategory.Human:

                    for (int i = 0; i < list.Count; i++)

                    {

                        Treasure treasure;

                        if (model.TryGetTreasure(list[i], out treasure))

                        {

                            var humanTreasure = treasure as HumanTreasure;

                            if (treasure.achievementRedpoint.state == RedPointState.Simple

                                || treasure.skillLevelUpRedpoint.state == RedPointState.Simple

                                || humanTreasure.castSoulRedpoint.state == RedPointState.Simple

                                || humanTreasure.humanState == HumanTreasureState.Challenge)

                            {

                                if (list[i] > UI3DTreasureSelectStage.Instance.selectTreasure)

                                {

                                    if (rightSelect || gotoId == 0)

                                    {

                                        gotoId = list[i];

                                        break;

                                    }

                                }

                                else if (list[i] < UI3DTreasureSelectStage.Instance.selectTreasure)

                                {

                                    gotoId = list[i];

                                }

                            }

                        }

                    }

                    break;

                case TreasureCategory.Demon:

                    for (int i = 0; i < list.Count; i++)

                    {

                        TreasureDungeon treasureDungeon;

                        if (model.TryGetTreasureDungeon(list[i], out treasureDungeon))

                        {

                            if (treasureDungeon.challengeRedpoint.state == RedPointState.Simple)

                            {

                                if (list[i] > UI3DTreasureSelectStage.Instance.selectTreasure)

                                {

                                    if (rightSelect || gotoId == 0)

                                    {

                                        gotoId = list[i];

                                        break;

                                    }

                                }

                                else if (list[i] < UI3DTreasureSelectStage.Instance.selectTreasure)

                                {

                                    gotoId = list[i];

                                }

                            }

                        }

                    }

                    break;

            }

            if (gotoId != 0)

            {

                rightSelect = gotoId > UI3DTreasureSelectStage.Instance.selectTreasure;

                UI3DTreasureSelectStage.Instance.Goto(list.IndexOf(gotoId));

            }

        }

    }



}


 System/Treasure/UI3DTreasureSelectStage.cs

@@ -739,7 +739,7 @@
        #region 滑动

        bool draging = false;

        bool dragStarted = false;

        bool jumping = false;

        public bool jumping = false;

        float veiocity = 0;

        float min_angle = 0;

        float max_angle = 0;


 UI/Common/FunctionButton.cs

@@ -105,6 +105,7 @@
        }

        public event Action<string> OnPointClickLockFunc;
        public event Action repeatClickFunc;

        protected override void Awake()
        {
@@ -171,6 +172,10 @@

            if (!invokeForce && state == TitleBtnState.Click)
            {
                if (repeatClickFunc != null)

                {

                    repeatClickFunc();

                }
                return;
            }