Merge remote-tracking branch 'origin/master' into leonard

client_Wu Xijin

2018-10-29 6a55615a1bf346b6b7fd7e4b827ce80566647bea

 Assets/Resources/ScriptableObject/Config/WindowConfig.asset

@@ -112,8 +112,6 @@
      window: PrayerWin
    - order: 4
      window: AwardExchangeWin
    - order: 5
      window: WheelOfFortuneWin
  - parent: PetWin
    orderTables:
    - order: 0
@@ -156,6 +154,8 @@
      window: FlashRushToBuyWin
    - order: 15
      window: WishingPoolWin
    - order: 16
      window: WheelOfFortuneWin
  - parent: VipRechargeWin
    orderTables:
    - order: 0