Merge branch 'master' into leonard

client_Wu Xijin

2018-10-23 a974a2621a6dcb90b8fe52b23d075814873c0960

 System/Tip/PromoteDetailsWin.cs

@@ -72,6 +72,9 @@
                case RolePromoteModel.PromoteDetailType.BetterEquip:

                    WindowCenter.Instance.Open<KnapSackWin>();

                    break;

                case RolePromoteModel.PromoteDetailType.AddPoint:

                    WindowCenter.Instance.Open<RolePointWin>();

                    break;

                case RolePromoteModel.PromoteDetailType.EquipStrength:

                    WindowCenter.Instance.Open<EquipReinforceWin>();

                    break;