Merge branch 'master' into 技能升级修改

client_linchunjie

2019-04-28 befbbfa399d03b62bc10959597c42fe9f1c52edb

 System/Alchemy/AlchemyModel.cs

@@ -64,6 +64,8 @@
        public int stoveExp { get; private set; }

        public string alchemySuccRate { get; private set; }



        public int jumpAlchemy { get; set; }



        public bool isServerPrepare { get; private set; }



        Clock m_AlchemingClock = null;

@@ -272,7 +274,7 @@
                    alchemyCount = dict[_luckValue];

                }

            }

            return alchemyCount.Equals(default(AlchemyCount));

            return !alchemyCount.Equals(default(AlchemyCount));

        }



        public bool TryGetAlchemyMaterials(int alchemyId, out List<Item> items)