From 68baff072fec09242c710c4c253487c840b78e4a Mon Sep 17 00:00:00 2001
From: hzr <904249498@qq.com>
Date: 星期二, 04 九月 2018 18:12:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client
---
Assets/Resources/ScriptableObject/Config/WindowConfig.asset | 109 +-----------------------------------------------------
1 files changed, 2 insertions(+), 107 deletions(-)
diff --git a/Assets/Resources/ScriptableObject/Config/WindowConfig.asset b/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
index 6c32351..ca1ddf9 100644
--- a/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
+++ b/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
@@ -76,6 +76,8 @@
window: DemonJarWin
- order: 1
window: FairyGrabBossWin
+ - order: 2
+ window: FairyGrabBossWin
- parent: UnionPanel
orderTables:
- order: 2
@@ -158,110 +160,3 @@
window: XBStoreWin
- order: 3
window: XBWarehouseWin
- childWindows:
- - WorldBossWin
- - BossHomeWin
- - PersonalBossWin
- - ElderGodAreaWin
- - PreciousDropRecordWin
- - TeamListWin
- - MyTeamWin
- - RoleEquipWin
- - BagStoreWin
- - DepotWin
- - EquipDevourWin
- - ComposeWingsWin
- - ComposeTicketWin
- -
- - ComposeEquipWin
- - ComposeToolsWin
- - MagicianWin
- - SkillAccordWin
- - SkillPassWin
- - RuneMosaicWin
- - RuneBreakWin
- - RuneComposeWin
- - DemonJarWin
- - FairyMemberWin
- - FairyApplyWin
- - FairyLeagueWin
- - KingTempleWin
- - RealmUpWin
- - MarketDealWin
- - MarketPutawayWin
- - MarketDealRecordWin
- - InSevenDayWin
- - LevelGiftWin
- - SignInWin
- - PrayerWin
- - AwardExchangeWin
- - FairyJadeInvestmentWin
- - PetAttributeWin
- - MountWin
- - ImpactRankWin
- - ConsumeRebateWin
- - OpenServerRedEnvelopeWin
- - OSTimeLimitGiftWin
- - FlashSaleWin
- - MultipleExpWin
- - NPracticePointWin
- - OpenServerGiftWin
- - BossRebornWin
- - LimitedTimePackageWin
- - RechargeWin
- - VipWin
- - VipInvestWin
- - FairyJadeInvestmentWin
- - WorldBossWin
- - BossHomeWin
- - PersonalBossWin
- - ElderGodAreaWin
- - PreciousDropRecordWin
- - TeamListWin
- - MyTeamWin
- - RoleEquipWin
- - BagStoreWin
- - DepotWin
- - EquipDevourWin
- - ComposeWingsWin
- - ComposeTicketWin
- - FairyGrabBossWin
- - ComposeEquipWin
- - ComposeToolsWin
- - MagicianWin
- - SkillAccordWin
- - SkillPassWin
- - RuneMosaicWin
- - RuneBreakWin
- - RuneComposeWin
- - DemonJarWin
- - FairyMemberWin
- - FairyApplyWin
- - FairyLeagueWin
- - KingTempleWin
- - RealmUpWin
- - MarketDealWin
- - MarketPutawayWin
- - MarketDealRecordWin
- - InSevenDayWin
- - LevelGiftWin
- - SignInWin
- - PrayerWin
- - AwardExchangeWin
- - FairyJadeInvestmentWin
- - PetAttributeWin
- - MountWin
- - ImpactRankWin
- - ConsumeRebateWin
- - OpenServerRedEnvelopeWin
- - OSTimeLimitGiftWin
- - FlashSaleWin
- - MultipleExpWin
- - NPracticePointWin
- - OpenServerGiftWin
- - BossRebornWin
- - LimitedTimePackageWin
- - RechargeWin
- - VipWin
- - VipInvestWin
- - FairyJadeInvestmentWin
--
Gitblit v1.8.0