[3001]成长基金移至精彩活动

client_linchunjie

2018-08-29 af81524a5f91963d92ce16ea25805a99cf40d654

[3001]成长基金移至精彩活动

Conflicts:
	Assets/Resources/ScriptableObject/Config/WindowConfig.asset

 Assets/Resources/ScriptableObject/Config/WindowConfig.asset

@@ -46,8 +46,8 @@
      window: ComposeWingsWin
    - order: 1
      window: ComposeTicketWin
    - order: 5
      window: ComposeDogzEquipWin
    - order: 2
      window: 
    - order: 3
      window: ComposeEquipWin
    - order: 4
@@ -110,8 +110,6 @@
      window: PrayerWin
    - order: 4
      window: AwardExchangeWin
    - order: 5
      window: FairyJadeInvestmentWin
  - parent: PetWin
    orderTables:
    - order: 0
@@ -140,6 +138,8 @@
      window: BossRebornWin
    - order: 7
      window: LimitedTimePackageWin
    - order: 10
      window: FairyJadeInvestmentWin
  - parent: VipRechargeWin
    orderTables:
    - order: 0
@@ -148,16 +148,8 @@
      window: VipWin
    - order: 2
      window: VipInvestWin
  - parent: HappyXBWin
    orderTables:
    - order: 0
      window: BestXBWin
    - order: 1
      window: RuneXBWin
    - order: 2
      window: XBStoreWin
    - order: 3
      window: XBWarehouseWin
      window: FairyJadeInvestmentWin
  childWindows:
  - WorldBossWin
  - BossHomeWin
@@ -172,7 +164,7 @@
  - EquipDevourWin
  - ComposeWingsWin
  - ComposeTicketWin
  - ComposeDogzEquipWin
  - 
  - ComposeEquipWin
  - ComposeToolsWin
  - MagicianWin
@@ -211,10 +203,7 @@
  - RechargeWin
  - VipWin
  - VipInvestWin
  - BestXBWin
  - RuneXBWin
  - XBStoreWin
  - XBWarehouseWin
  - FairyJadeInvestmentWin
  - WorldBossWin
  - BossHomeWin
  - PersonalBossWin
@@ -228,7 +217,7 @@
  - EquipDevourWin
  - ComposeWingsWin
  - ComposeTicketWin
  - ComposeDogzEquipWin
  - 
  - ComposeEquipWin
  - ComposeToolsWin
  - MagicianWin
@@ -267,8 +256,4 @@
  - RechargeWin
  - VipWin
  - VipInvestWin
  - BestXBWin
  - RuneXBWin
  - XBStoreWin
  - XBWarehouseWin
  - FairyGrabBossWin
  - FairyJadeInvestmentWin