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

Client_PangDeRong

2018-08-22 57d033c7c3eabeb6503827676856cb65f84fa2f1

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

 Core/GameEngine/Model/TelPartialConfig/tagStoreConfig.cs

@@ -10,7 +10,7 @@
        private static Dictionary<string, List<StoreConfig>> s_canBuyShopDict = new Dictionary<string, List<StoreConfig>>();  //用于存储可以购买的商品

        private static Dictionary<StoreItem, StoreConfig> s_StoreItemDict = new Dictionary<StoreItem, StoreConfig>();

        private static Dictionary<int, List<StoreConfig>> s_TheOnlyShopDict = new Dictionary<int, List<StoreConfig>>();  //key 唯一商品的物品id



        private static Dictionary<int, List<StoreConfig>> storeConfigs = new Dictionary<int, List<StoreConfig>>();

        public void OnConfigParseCompleted()

        {

            if (!s_storeModelDict.ContainsKey(ShopType))

@@ -59,6 +59,14 @@
            {

                s_StoreItemDict.Add(_storeItem, this);

            }



            List<StoreConfig> list = null;

            if(!storeConfigs.TryGetValue(ShopType,out list))

            {

                list = new List<StoreConfig>();

                storeConfigs.Add(ShopType, list);

            }

            list.Add(this);

        }



        private static List<StoreConfig> modellist = new List<StoreConfig>();

@@ -272,6 +280,11 @@
            return null;

        }



        public static bool TryGetStoreConfigs(int shopType, out List<StoreConfig> list)

        {

            return storeConfigs.TryGetValue(shopType, out list);

        }



        public struct StoreItem

        {

            public int item;


 System/Login/LoginModel.cs

@@ -15,8 +15,7 @@
        public SDKUtility.FP_LoginOk sdkLoginResult;

        public SDKUtility.FP_CheckIDAuthentication sdkIDCheckIDAuthentication;



        public string localSaveAccountName

        {

        public string localSaveAccountName {

            get { return LocalSave.GetString(USER_ACCOUNT); }

            set { LocalSave.SetString(USER_ACCOUNT, value); }

        }

@@ -25,22 +24,19 @@
        public event Action accountBindOkEvent;



        bool m_ReconnecBackGround = false;

        public bool reconnectBackGround

        {

        public bool reconnectBackGround {

            get { return m_ReconnecBackGround; }

            set { m_ReconnecBackGround = value; }

        }



        bool m_OnCreateRole = false;

        public bool onCreateRole

        {

        public bool onCreateRole {

            get { return m_OnCreateRole; }

            set { m_OnCreateRole = value; }

        }



        bool m_Busy = false;

        public bool busy

        {

        public bool busy {

            get { return m_Busy; }

            set { m_Busy = value; }

        }

@@ -144,6 +140,9 @@
            }



            busy = true;



            try

            {

            reconnectBackGround = false;

            accountBuf = _account;

            localSaveAccountName = accountBuf;

@@ -155,6 +154,13 @@


            GameNetSystem.Instance.OnAccountLogin();

            NetLinkWin.Show();

            }

            catch (Exception ex)

            {

                Debug.Log(ex);

                busy = false;

            }



        }



        public void AccountLogin(string _ip, int _port, int _gamePort)

@@ -175,9 +181,16 @@
            busy = true;

            reconnectBackGround = true;



            try

            {

            ConnectGameServer(ipBuf, gamePortBuf);



            NetLinkWin.Show();

            }

            catch (Exception ex)

            {

                Debug.Log(ex);

                busy = false;

            }

        }



        private void OnAccountLogin(bool _ok, string _result)

@@ -212,8 +225,16 @@
            }



            localSaveAccountName = accountBuf;

            try

            {

            ConnectGameServer(ipBuf, gamePortBuf);

        }

            catch (Exception ex)

            {

                busy = false;

                Debug.Log(ex);

            }

        }



        void ConnectGameServer(string _ip, int _port)

        {


 System/OpenServerActivity/OSGiftModel.cs

@@ -103,7 +103,8 @@
            {

                return false;

            }

            var _list = StoreConfig.GetTypeStoreModel((int)StoreFunc.OSGift);

            List<StoreConfig> _list = null;

            StoreConfig.TryGetStoreConfigs((int)StoreFunc.OSGift,out _list);

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

            {

                var _limit = storeModel.GetBuyShopLimit((uint)_list[i].ID);


 System/OpenServerActivity/OpenServerGiftWin.cs

@@ -90,7 +90,8 @@


        private void Display()

        {

            var _list = StoreConfig.GetTypeStoreModel((int)StoreFunc.OSGift, true);

            List<StoreConfig> _list = null;

            StoreConfig.TryGetStoreConfigs((int)StoreFunc.OSGift, out _list);

            var _index = 0;

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

            {


 System/Realm/RealmUpWin.cs

@@ -59,7 +59,6 @@


        int cacheRealmPoint = 0;

        Coroutine cacheCoroutine = null;

        RuntimeAnimatorController cacheController = null;

        const string State_EnterHash = "Show";

        const string State_IdleHash = "Idle";



@@ -127,10 +126,6 @@
                StopCoroutine(cacheCoroutine);

                cacheCoroutine = null;

            }

            if (cacheController != null)

            {

                cacheController = null;

            }

        }



        protected override void OnAfterClose()

@@ -149,7 +144,6 @@
        IEnumerator Co_DisplayBossShow()

        {

            yield return WaitingForSecondConst.WaitMS800;

            ResetRunTimeController();

            var config = Config.Instance.Get<RealmConfig>(PlayerDatas.Instance.baseData.realmLevel);

            m_RawPlayer.gameObject.SetActive(false);

            UI3DModelExhibition.Instance.StopShowPlayer();

@@ -280,7 +274,6 @@
            {

                m_RawBoss.gameObject.SetActive(true);

                m_RawPlayer.gameObject.SetActive(false);

                ResetRunTimeController();

                UI3DModelExhibition.Instance.StopShowPlayer();

                StartBoss(config);

            }

@@ -288,21 +281,7 @@


        private void StopBoss()

        {

            ResetRunTimeController();

            UI3DModelExhibition.Instance.StopShowNPC();

        }



        private void ResetRunTimeController()

        {

            var npcModel = UI3DModelExhibition.Instance.NpcModelPet;

            if (npcModel != null)

            {

                var animator = npcModel.GetComponentInChildren<Animator>();

                if (animator != null && cacheController != null)

                {

                    animator.runtimeAnimatorController = cacheController;

                }

            }

        }



        private void StartBoss(RealmConfig config, bool act = false)

@@ -319,7 +298,6 @@
                var animator = npcModel.GetComponentInChildren<Animator>();

                if (animator != null)

                {

                    cacheController = animator.runtimeAnimatorController;

                    var runtimeController = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerRealmSuffix, npcConfig.MODE);

                    animator.runtimeAnimatorController = runtimeController;

                    animator.Play(act ? State_EnterHash : State_IdleHash, 0);


 System/Treasure/TreasureNewGotWin.cs

@@ -289,6 +289,7 @@


            var config = Config.Instance.Get<TreasureConfig>(treasure.id);

            m_TreasureName.text = config.Name;

            m_Story.text = config.Story;

            m_Category.text = Language.Get(string.Concat("GetTreasure_", config.Category));

            if ((TreasureCategory)config.Category == TreasureCategory.Human)

            {


 System/Vip/OSTimeLimitGiftModel.cs

@@ -46,7 +46,8 @@
        public override void Init()

        {

            var _openDay = 0;

            var _list = StoreConfig.GetTypeStoreModel((int)StoreFunc.OSTimeLimitGift);

            List<StoreConfig> _list = null;

            StoreConfig.TryGetStoreConfigs((int)StoreFunc.OSTimeLimitGift, out _list);

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

            {

                List<StoreConfig> _configs = null;


 UI/Common/UI3DModelFactory.cs

@@ -96,6 +96,7 @@
        var animator = model.GetComponent<Animator>();

        if (animator != null)

        {

            ResetRealmBossAnimator(id, animator);

            animator.enabled = false;

        }



@@ -110,6 +111,27 @@
        }

    }



    private static void ResetRealmBossAnimator(int _id, Animator animator)

    {

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

        var index = configs.FindIndex((x) =>

        {

            return x.BossID == _id;

        });

        if (index != -1)

        {

            var npcConfig = Config.Instance.Get<NPCConfig>(_id);

            if (npcConfig != null)

            {

                var runtimeController = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, npcConfig.MODE);

                if (runtimeController != null)

                {

                    animator.runtimeAnimatorController = runtimeController;

                }

            }

        }

    }



    public static GameObject LoadUIHorse(int id)

    {

        var prefab = InstanceResourcesLoader.LoadModelRes(id);