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

client_Wu Xijin

2018-09-30 8569d1262b6b6afa4ba84b2f3aafe6cacc7aba3a

 Assets/Resources/ScriptableObject/Config/WindowConfig.asset

@@ -174,3 +174,13 @@
      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