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

CeHua_ZWJ

2018-09-18 b40679325a7a1607aba9856ec5299f47e77221fb

 Assets/Resources/ScriptableObject/Config/WindowConfig.asset

@@ -74,10 +74,8 @@
    orderTables:
    - order: 0
      window: DemonJarWin
    - order: 1
      window: FairyGrabBossWin
    - order: 2
      window: FairyGrabBossWin
      window: DogzDungeonWin
  - parent: UnionPanel
    orderTables:
    - order: 2
@@ -118,6 +116,8 @@
      window: PetAttributeWin
    - order: 1
      window: MountWin
    - order: 2
      window: FairyGrabBossWin
  - parent: OpenServerActivityWin
    orderTables:
    - order: 0