Merge branch 'master' into leonard

client_Wu Xijin

2018-10-21 6f8ed2e37f8762fb3501a671d0dca40bcd68edae

 Assets/Resources/ScriptableObject/Config/WindowConfig.asset

@@ -46,8 +46,8 @@
      window: ComposeWingsWin
    - order: 1
      window: ComposeTicketWin
    - order: 2
      window: 
    - order: 5
      window: ComposeDogzEquipWin
    - order: 3
      window: ComposeEquipWin
    - order: 4
@@ -62,6 +62,8 @@
      window: SkillAccordWin
    - order: 1
      window: SkillPassWin
    - order: 2
      window: TalentWin
  - parent: RunePanel
    orderTables:
    - order: 0
@@ -74,6 +76,8 @@
    orderTables:
    - order: 0
      window: DemonJarWin
    - order: 1
      window: DogzDungeonWin
  - parent: UnionPanel
    orderTables:
    - order: 2
@@ -106,14 +110,18 @@
      window: SignInWin
    - order: 1
      window: PrayerWin
    - order: 6
    - 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
@@ -136,13 +144,51 @@
      window: BossRebornWin
    - order: 7
      window: LimitedTimePackageWin
    - order: 10
      window: FairyJadeInvestmentWin
    - order: 11
      window: VipInvestWin
    - order: 12
      window: FairyLeagueNoticeWin
    - order: 13
      window: FairyGrabBossNoticeWin
    - order: 14
      window: FlashRushToBuyWin
  - parent: VipRechargeWin
    orderTables:
    - order: 0
      window: RechargeWin
    - order: 1
      window: VipWin
  - parent: HappyXBWin
    orderTables:
    - order: 0
      window: BestXBWin
    - order: 1
      window: RuneXBWin
    - order: 2
      window: VipInvestWin
      window: XBStoreWin
    - order: 3
      window: FairyJadeInvestmentWin
      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