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

@@ -75,9 +75,7 @@
    - order: 0
      window: DemonJarWin
    - order: 1
      window: FairyGrabBossWin
    - order: 2
      window: FairyGrabBossWin
      window: DogzDungeonWin
  - parent: UnionPanel
    orderTables:
    - order: 2
@@ -112,12 +110,16 @@
      window: PrayerWin
    - order: 4
      window: AwardExchangeWin
    - order: 5
      window: WheelOfFortuneWin
  - parent: PetWin
    orderTables:
    - order: 0
      window: PetAttributeWin
    - order: 1
      window: MountWin
    - order: 2
      window: FairyGrabBossWin
  - parent: OpenServerActivityWin
    orderTables:
    - order: 0
@@ -142,14 +144,18 @@
      window: LimitedTimePackageWin
    - order: 10
      window: FairyJadeInvestmentWin
    - order: 11
      window: VipInvestWin
    - order: 12
      window: FairyLeagueNoticeWin
    - order: 13
      window: FairyGrabBossNoticeWin
  - parent: VipRechargeWin
    orderTables:
    - order: 0
      window: RechargeWin
    - order: 1
      window: VipWin
    - order: 2
      window: VipInvestWin
  - parent: HappyXBWin
    orderTables:
    - order: 0
@@ -160,3 +166,25 @@
      window: XBStoreWin
    - order: 3
      window: XBWarehouseWin
  - parent: SocialWin
    orderTables:
    - order: 1
      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