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

cehua-TT

2018-10-10 1ae636e9d41cd8b7b6d36f0a11a51a245812ac72

 Assets/Resources/ScriptableObject/Config/WindowConfig.asset

@@ -110,6 +110,8 @@
      window: PrayerWin
    - order: 4
      window: AwardExchangeWin
    - order: 5
      window: WheelOfFortuneWin
  - parent: PetWin
    orderTables:
    - order: 0
@@ -146,6 +148,8 @@
      window: VipInvestWin
    - order: 12
      window: FairyLeagueNoticeWin
    - order: 13
      window: FairyGrabBossNoticeWin
  - parent: VipRechargeWin
    orderTables:
    - order: 0