Merge branch '2960仙盟抢Boss活动'

client_linchunjie

2018-08-30 9b17184f6ab5b35dfe0debb9a23cc337dab5b2c7

 Assets/Resources/ScriptableObject/Config/WindowConfig.asset

@@ -74,6 +74,8 @@
    orderTables:
    - order: 0
      window: DemonJarWin
    - order: 1
      window: FairyGrabBossWin
  - parent: UnionPanel
    orderTables:
    - order: 2
@@ -223,7 +225,7 @@
  - EquipDevourWin
  - ComposeWingsWin
  - ComposeTicketWin
  - 
  - FairyGrabBossWin
  - ComposeEquipWin
  - ComposeToolsWin
  - MagicianWin