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

client_Wu Xijin

2018-08-31 00c38d7881142738660b6c53c90afa00daf66d25

 System/Welfare/ConsumeRebateWin.cs

@@ -16,6 +16,7 @@
        [SerializeField] Text m_OperationSurplusTime;

        [SerializeField] Text m_OperationOpenTime;

        [SerializeField] Text m_OperationSurplusTimeTitle;

        [SerializeField] Text m_Rule;



        [SerializeField] ScrollerController m_Controller;



@@ -133,6 +134,7 @@
                        m_Controller.AddCell(ScrollerDataType.Header, i);

                    }

                }

                m_Rule.gameObject.SetActive(operation.dayReset);

            }

            m_Controller.Restart();

        }