Merge branch 'master' into ILRuntime

lwb

2021-02-22 a9b4bb435fc0eda83fa5338f40ff854bd9844361

 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -124,10 +124,7 @@
                {

                    monthWeekInvestModel.selectType = monthWeekInvestModel.GetSelectType();

                }

                else

                {

                    OpenServerActivityCenter.Instance.SetSelectDefaultChildType(functionOrder);

                }

                
                UpdateFunctionBtns();

            }

            OnOpenActivity(functionOrder);

@@ -243,7 +240,6 @@
                                monthWeekInvestModel.selectType = monthWeekInvestModel.GetSelectType();

                                break;

                            default:

                                OpenServerActivityCenter.Instance.SetSelectDefaultChildType(activityId);

                                break;

                        }

                    }

@@ -407,8 +403,6 @@
                    _cell.SetSelect(_type == monthWeekInvestModel.selectType);

                    break;

                default:

                    _cell.titleTxt.text = Language.Get(StringUtility.Contact("OpenServerActivityChild_", _order, "_", _type));

                    _cell.SetSelect(_type == OpenServerActivityCenter.Instance.GetChildSelectType(_order));

                    break;

            }



@@ -582,7 +576,6 @@
                    monthWeekInvestModel.selectType = _type;

                    break;

                default:

                    OpenServerActivityCenter.Instance.SetSelectChildType(_order, _type);

                    break;

            }

            m_ActivityCtrl.m_Scorller.RefreshActiveCellViews();