Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/OpenServerActivity/OSGiftBehaviour.cs

@@ -69,7 +69,7 @@


        public void Display(int _id)

        {

            var _storeConfig = ConfigManager.Instance.GetTemplate<StoreConfig>(_id);

            var _storeConfig = Config.Instance.Get<StoreConfig>(_id);

            if (_storeConfig == null)

            {

                return;

@@ -118,7 +118,7 @@


        private void OnBuyBtn()

        {

            var _storeConfig = ConfigManager.Instance.GetTemplate<StoreConfig>(storeId);

            var _storeConfig = Config.Instance.Get<StoreConfig>(storeId);

            if (_storeConfig == null)

            {

                return;

@@ -158,7 +158,7 @@


        private void OnItemClick(int _index)

        {

            var _storeConfig = ConfigManager.Instance.GetTemplate<StoreConfig>(storeId);

            var _storeConfig = Config.Instance.Get<StoreConfig>(storeId);

            if (_storeConfig == null)

            {

                return;