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

client_Wu Xijin

2018-08-30 82bb46b6031d2c6e86c4d98c9905b8657b4b6cff

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

 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