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

client_Wu Xijin

2018-10-11 2ee4887fe1b4d0073dfb8a118d25e15bff3e578b

 Assets/Resources/ScriptableObject/Config/WindowConfig.asset

@@ -74,7 +74,7 @@
    orderTables:
    - order: 0
      window: DemonJarWin
    - order: 2
    - order: 1
      window: DogzDungeonWin
  - parent: UnionPanel
    orderTables:
@@ -110,6 +110,8 @@
      window: PrayerWin
    - order: 4
      window: AwardExchangeWin
    - order: 5
      window: WheelOfFortuneWin
  - parent: PetWin
    orderTables:
    - order: 0
@@ -144,6 +146,10 @@
      window: FairyJadeInvestmentWin
    - order: 11
      window: VipInvestWin
    - order: 12
      window: FairyLeagueNoticeWin
    - order: 13
      window: FairyGrabBossNoticeWin
  - parent: VipRechargeWin
    orderTables:
    - order: 0
@@ -166,3 +172,19 @@
      window: TeamChatWin
    - order: 2
      window: FairyChatWin
  - parent: DogzWin
    orderTables:
    - order: 0
      window: DogzActiveWin
    - order: 1
      window: GodBeastReinforcementWin
  - parent: FairylandCeremonyWin
    orderTables:
    - order: 0
      window: CeremonyRechargeGiftWin
    - order: 1
      window: CeremonyFirepartyWin
    - order: 2
      window: CeremonyPeopleToHiWin
    - order: 3
      window: CeremonyOutOfPrintWin