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

client_linchunjie

2018-09-18 88b5fa645a240169bf944cf32571bfa9179928e5

 Assets/Resources/ScriptableObject/Config/WindowConfig.asset

@@ -142,14 +142,14 @@
      window: LimitedTimePackageWin
    - order: 10
      window: FairyJadeInvestmentWin
    - order: 11
      window: VipInvestWin
  - parent: VipRechargeWin
    orderTables:
    - order: 0
      window: RechargeWin
    - order: 1
      window: VipWin
    - order: 2
      window: VipInvestWin
  - parent: HappyXBWin
    orderTables:
    - order: 0