From 723604e6defc7414b0423c3d0d6980233531659b Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 09 十一月 2018 09:42:44 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
Assets/Editor/SpritePacking/SpriteSettings.asset | 16 ++
Assets/Editor/Tool/AudioClipImport.cs | 6
.gitignore | 3
Assets/Editor/Logo/TheSecondWorld/TB_DL_Logo.png.meta | 2
Assets/Editor/Logo/snxxz_ios/Launch.png | 0
Assets/Editor/Tool/AssetBundleBuildExtersion.cs | 51 ++++++
Assets/Resources/Config/PriorBundle.txt | 162 ++++++++++---------
Assets/Editor/Logo/shandangceshi_ios/TB_DL_Logo.png.meta | 2
Assets/Resources/ScriptableObject/Config/WindowConfig.asset | 198 ++++++++++++++++++++++++
9 files changed, 356 insertions(+), 84 deletions(-)
diff --git a/.gitignore b/.gitignore
index c8188d9..53a659d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,7 +35,10 @@
*.csproj
*.sln
AssetBundles/*
+Assets/StreamingAssets.meta
Assets/StreamingAssets/*
RunTimeLog/*
IOS_BUILD/
.vscode
+Assets/BundleTest.meta
+Assets/BundleTest/*
diff --git a/Assets/Editor/Logo/TheSecondWorld/TB_DL_Logo.png.meta b/Assets/Editor/Logo/TheSecondWorld/TB_DL_Logo.png.meta
index a2d9f99..1413a83 100644
--- a/Assets/Editor/Logo/TheSecondWorld/TB_DL_Logo.png.meta
+++ b/Assets/Editor/Logo/TheSecondWorld/TB_DL_Logo.png.meta
@@ -88,5 +88,5 @@
outline: []
spritePackingTag:
userData:
- assetBundleName: ui/sprite/common
+ assetBundleName:
assetBundleVariant:
diff --git a/Assets/Editor/Logo/shandangceshi_ios/TB_DL_Logo.png.meta b/Assets/Editor/Logo/shandangceshi_ios/TB_DL_Logo.png.meta
index 9a710ef..31be297 100644
--- a/Assets/Editor/Logo/shandangceshi_ios/TB_DL_Logo.png.meta
+++ b/Assets/Editor/Logo/shandangceshi_ios/TB_DL_Logo.png.meta
@@ -88,5 +88,5 @@
outline: []
spritePackingTag:
userData:
- assetBundleName: ui/sprite/common
+ assetBundleName:
assetBundleVariant:
diff --git a/Assets/Editor/Logo/snxxz_ios/Launch.png b/Assets/Editor/Logo/snxxz_ios/Launch.png
index ab1904f..36b0e00 100644
--- a/Assets/Editor/Logo/snxxz_ios/Launch.png
+++ b/Assets/Editor/Logo/snxxz_ios/Launch.png
Binary files differ
diff --git a/Assets/Editor/SpritePacking/SpriteSettings.asset b/Assets/Editor/SpritePacking/SpriteSettings.asset
index c0abe58..80bfccb 100644
--- a/Assets/Editor/SpritePacking/SpriteSettings.asset
+++ b/Assets/Editor/SpritePacking/SpriteSettings.asset
@@ -476,3 +476,19 @@
maxTextureSize: 1024
textureFormat: 4
compressionQuality: 1
+ - folderName: zDog
+ meshType: 0
+ alphaSource: 1
+ platformSettings:
+ - name: Standalone
+ maxTextureSize: 1024
+ textureFormat: 4
+ compressionQuality: 1
+ - name: Android
+ maxTextureSize: 1024
+ textureFormat: 47
+ compressionQuality: 1
+ - name: iPhone
+ maxTextureSize: 1024
+ textureFormat: 33
+ compressionQuality: 1
diff --git a/Assets/Editor/Tool/AssetBundleBuildExtersion.cs b/Assets/Editor/Tool/AssetBundleBuildExtersion.cs
index be8984d..6008b6c 100644
--- a/Assets/Editor/Tool/AssetBundleBuildExtersion.cs
+++ b/Assets/Editor/Tool/AssetBundleBuildExtersion.cs
@@ -75,4 +75,55 @@
}
}
+ [MenuItem("Assets/BuildAssetBundle ( Test )")]
+ public static void BuildTest()
+ {
+ if (Selection.activeObject != null)
+ {
+ var path = AssetDatabase.GetAssetPath(Selection.activeObject);
+ var importer = AssetImporter.GetAtPath(path);
+
+ if (importer != null)
+ {
+ var ab = importer.assetBundleName;
+ if (!string.IsNullOrEmpty(ab))
+ {
+
+ var assetBundles = AssetDatabase.GetAllAssetBundleNames();
+
+ List<string> targetAssetBundles = new List<string>();
+ for (int i = 0; i < assetBundles.Length; i++)
+ {
+ var bundleName = assetBundles[i];
+ if (bundleName == ab)
+ {
+ targetAssetBundles.Add(bundleName);
+ }
+ }
+
+ var assets = new List<AssetBundleBuild>();
+ for (int i = 0; i < targetAssetBundles.Count; i++)
+ {
+ var assetBundleBuild = new AssetBundleBuild();
+ assetBundleBuild.assetBundleName = targetAssetBundles[i];
+ assetBundleBuild.assetNames = AssetDatabase.GetAssetPathsFromAssetBundle(targetAssetBundles[i]);
+ assets.Add(assetBundleBuild);
+ }
+
+ var opt = BuildAssetBundleOptions.None
+ | BuildAssetBundleOptions.ChunkBasedCompression
+ | BuildAssetBundleOptions.DeterministicAssetBundle;
+
+ var dirctory = Application.dataPath + "/BundleTest";
+ if (!Directory.Exists(dirctory))
+ {
+ Directory.CreateDirectory(dirctory);
+ }
+ BuildPipeline.BuildAssetBundles(dirctory, assets.ToArray(), opt, BuildTarget.Android);
+ }
+ }
+
+ }
+ }
+
}
diff --git a/Assets/Editor/Tool/AudioClipImport.cs b/Assets/Editor/Tool/AudioClipImport.cs
index 9da9cd9..03746d5 100644
--- a/Assets/Editor/Tool/AudioClipImport.cs
+++ b/Assets/Editor/Tool/AudioClipImport.cs
@@ -14,19 +14,19 @@
static AudioClipImport()
{
standalone = new AudioImporterSampleSettings();
- standalone.quality = 0.5f;
+ standalone.quality = 0.01f;
standalone.loadType = AudioClipLoadType.CompressedInMemory;
standalone.sampleRateSetting = AudioSampleRateSetting.OptimizeSampleRate;
standalone.compressionFormat = AudioCompressionFormat.Vorbis;
android = new AudioImporterSampleSettings();
- android.quality = 0.5f;
+ android.quality = 0.01f;
android.loadType = AudioClipLoadType.CompressedInMemory;
android.sampleRateSetting = AudioSampleRateSetting.OptimizeSampleRate;
android.compressionFormat = AudioCompressionFormat.Vorbis;
ios = new AudioImporterSampleSettings();
- ios.quality = 0.5f;
+ ios.quality = 0.01f;
ios.loadType = AudioClipLoadType.CompressedInMemory;
ios.sampleRateSetting = AudioSampleRateSetting.OptimizeSampleRate;
ios.compressionFormat = AudioCompressionFormat.Vorbis;
diff --git a/Assets/Resources/Config/PriorBundle.txt b/Assets/Resources/Config/PriorBundle.txt
index 185b998..e9e7450 100644
--- a/Assets/Resources/Config/PriorBundle.txt
+++ b/Assets/Resources/Config/PriorBundle.txt
@@ -26,82 +26,86 @@
23 prefab_race_N034 2 1
24 prefab_race_N012 2 1
25 prefab_race_N003 2 1
-26 prefab_race_M131 2 1
-27 prefab_race_N010 2 1
-28 prefab_race_M128 2 2
-29 prefab_race_N013 2 2
-30 prefab_race_M126 2 2
-31 prefab_race_N015 2 2
-32 prefab_race_M008 2 2
-33 prefab_race_M704 2 2
-34 prefab_race_M703 2 2
-35 prefab_race_M012 2 2
-36 prefab_race_M011 2 2
-37 prefab_race_M013 2 2
-38 prefab_race_M014 2 2
-39 prefab_race_M135 2 2
-40 prefab_race_N011 2 2
-41 prefab_race_N017 2 2
-42 prefab_race_M129 2 3
-43 prefab_race_M132 2 3
-44 prefab_race_M015 2 3
-45 prefab_race_M017 2 3
-46 prefab_race_M018 2 3
-47 prefab_race_M016 2 3
-48 prefab_race_M700 2 3
-49 prefab_race_M701 2 3
-50 prefab_race_M021 2 3
-51 prefab_race_M063 2 3
-52 prefab_race_M064 2 3
-53 prefab_race_M065 2 3
-54 prefab_race_M097 2 3
-55 prefab_race_L004 2 3
-56 prefab_race_M104 2 3
-57 prefab_race_Sh01 2 1
-58 prefab_race_Sh02 2 1
-59 prefab_race_N031 2 2
-60 prefab_race_N032 2 2
-61 prefab_race_A_Zs00 2 1
-62 prefab_race_A_Fs00 2 1
-63 prefab_race_A_Zs00_Wq 2 1
-64 prefab_race_A_Fs00_Wq 2 1
-65 prefab_race_A_Zs00_fwq 2 1
-66 prefab_race_A_Fs00_fwq 2 1
-67 prefab_race_A_Zs01 2 1
-68 prefab_race_A_Fs01 2 1
-69 prefab_race_A_Zs01_Wq 2 1
-70 prefab_race_A_Fs01_Wq 2 1
-71 prefab_race_A_Zs01_fwq 2 1
-72 prefab_race_A_Fs01_fwq 2 1
-73 prefab_race_A_Zs02 2 2
-74 prefab_race_A_Fs02 2 2
-75 prefab_race_A_Zs02_Wq 2 2
-76 prefab_race_A_Fs02_Wq 2 2
-77 prefab_race_A_Zs02_fwq 2 2
-78 prefab_race_A_Fs02_fwq 2 2
-79 prefab_race_Zq04 2 1
-80 Prefab_Race_B_Cw06 2 1
-81 prefab_race_A_Zs99_Wq 2 2
-82 prefab_race_A_Fs99_Wq 2 2
-83 Prefab_Race_B_Cw09 2 2
-84 prefab_race_Zq05 2 2
-85 prefab_race_A_Zs_Cb01 2 1
-86 prefab_race_A_Fs_Cb01 2 1
-87 prefab_race_B_Cw02 2 2
-88 prefab_race_Zq01 2 2
-89 prefab_race_B_Cw16 2 2
-90 prefab_race_ranshaoquan 2 2
-91 prefab_race_Zq00 2 2
-92 boss1 3 1
-93 music1 3 1
-94 role1 3 1
-95 show1 3 1
-96 speak1 3 1
-97 ui1 3 1
-98 bossskill1 4 1
-99 cj 4 1
-100 common1 4 1
-101 debuff1 4 1
-102 dsskill1 4 1
-103 skill1 4 1
-104 ui1 4 1
\ No newline at end of file
+26 prefab_race_N002 2 1
+27 prefab_race_M131 2 1
+28 prefab_race_N010 2 1
+29 prefab_race_M128 2 2
+30 prefab_race_N013 2 2
+31 prefab_race_M126 2 2
+32 prefab_race_N015 2 2
+33 prefab_race_M008 2 2
+34 prefab_race_M704 2 2
+35 prefab_race_M703 2 2
+36 prefab_race_M012 2 2
+37 prefab_race_M011 2 2
+38 prefab_race_M013 2 2
+39 prefab_race_M014 2 2
+40 prefab_race_M135 2 2
+41 prefab_race_N011 2 2
+42 prefab_race_N017 2 2
+43 prefab_race_M129 2 3
+44 prefab_race_M132 2 3
+45 prefab_race_M015 2 3
+46 prefab_race_M017 2 3
+47 prefab_race_M018 2 3
+48 prefab_race_M016 2 3
+49 prefab_race_M700 2 3
+50 prefab_race_M701 2 3
+51 prefab_race_M021 2 3
+52 prefab_race_M063 2 3
+53 prefab_race_M064 2 3
+54 prefab_race_M065 2 3
+55 prefab_race_M097 2 3
+56 prefab_race_L004 2 3
+57 prefab_race_M104 2 3
+58 prefab_race_Sh01 2 1
+59 prefab_race_Sh02 2 1
+60 prefab_race_N031 2 2
+61 prefab_race_N032 2 2
+62 prefab_race_A_Zs00 2 1
+63 prefab_race_A_Fs00 2 1
+64 prefab_race_A_Zs00_Wq 2 1
+65 prefab_race_A_Zs00_Sb 2 1
+66 prefab_race_A_Fs00_Wq 2 1
+67 prefab_race_A_Zs00_fwq 2 1
+68 prefab_race_A_Fs00_fwq 2 1
+69 prefab_race_A_Zs01 2 1
+70 prefab_race_A_Fs01 2 1
+71 prefab_race_A_Zs01_Wq 2 1
+72 prefab_race_A_Zs01_Sb 2 1
+73 prefab_race_A_Fs01_Wq 2 1
+74 prefab_race_A_Zs01_fwq 2 1
+75 prefab_race_A_Fs01_fwq 2 1
+76 prefab_race_A_Zs02 2 2
+77 prefab_race_A_Fs02 2 2
+78 prefab_race_A_Zs02_Wq 2 2
+79 prefab_race_A_Zs02_Sb 2 2
+80 prefab_race_A_Fs02_Wq 2 2
+81 prefab_race_A_Zs02_fwq 2 2
+82 prefab_race_A_Fs02_fwq 2 2
+83 prefab_race_Zq04 2 1
+84 Prefab_Race_B_Cw06 2 1
+85 prefab_race_A_Zs99_Wq 2 2
+86 prefab_race_A_Fs99_Wq 2 2
+87 Prefab_Race_B_Cw09 2 2
+88 prefab_race_Zq05 2 2
+89 prefab_race_A_Zs_Cb01 2 1
+90 prefab_race_A_Fs_Cb01 2 1
+91 prefab_race_B_Cw02 2 2
+92 prefab_race_Zq01 2 2
+93 prefab_race_B_Cw16 2 2
+94 prefab_race_ranshaoquan 2 2
+95 prefab_race_Zq00 2 2
+96 boss1 3 1
+97 music1 3 1
+98 role1 3 1
+99 show1 3 1
+100 speak1 3 1
+101 ui1 3 1
+102 bossskill1 4 1
+103 cj 4 1
+104 common1 4 1
+105 debuff1 4 1
+106 dsskill1 4 1
+107 skill1 4 1
+108 ui1 4 1
\ No newline at end of file
diff --git a/Assets/Resources/ScriptableObject/Config/WindowConfig.asset b/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
new file mode 100644
index 0000000..3de38ea
--- /dev/null
+++ b/Assets/Resources/ScriptableObject/Config/WindowConfig.asset
@@ -0,0 +1,198 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: dfa5c93d9f8790242a9db3d3bb1815bc, type: 3}
+ m_Name: WindowConfig
+ m_EditorClassIdentifier:
+ windows:
+ - parent: FindPreciousFrameWin
+ orderTables:
+ - order: 0
+ window: WorldBossWin
+ - order: 1
+ window: BossHomeWin
+ - order: 2
+ window: PersonalBossWin
+ - order: 3
+ window: ElderGodAreaWin
+ - order: 4
+ window: PreciousDropRecordWin
+ - parent: TeamFrameWin
+ orderTables:
+ - order: 0
+ window: TeamListWin
+ - order: 1
+ window: MyTeamWin
+ - parent: KnapSackWin
+ orderTables:
+ - order: 0
+ window: RoleEquipWin
+ - order: 2
+ window: BagStoreWin
+ - order: 3
+ window: DepotWin
+ - order: 4
+ window: EquipDevourWin
+ - parent: ComposeWin
+ orderTables:
+ - order: 0
+ window: ComposeWingsWin
+ - order: 1
+ window: ComposeTicketWin
+ - order: 5
+ window: ComposeDogzEquipWin
+ - order: 3
+ window: ComposeEquipWin
+ - order: 4
+ window: ComposeToolsWin
+ - parent: RolePanel
+ orderTables:
+ - order: 3
+ window: MagicianWin
+ - parent: SkillPanel
+ orderTables:
+ - order: 0
+ window: SkillAccordWin
+ - order: 1
+ window: SkillPassWin
+ - order: 2
+ window: TalentWin
+ - parent: RunePanel
+ orderTables:
+ - order: 0
+ window: RuneMosaicWin
+ - order: 1
+ window: RuneBreakWin
+ - order: 2
+ window: RuneComposeWin
+ - parent: LootPreciousFrameWin
+ orderTables:
+ - order: 0
+ window: DemonJarWin
+ - order: 1
+ window: FairyGrabBossWin
+ - order: 2
+ window: DogzDungeonWin
+ - parent: UnionPanel
+ orderTables:
+ - order: 2
+ window: FairyMemberWin
+ - order: 3
+ window: FairyApplyWin
+ - order: 4
+ window: FairyLeagueWin
+ - order: 5
+ window: KingTempleWin
+ - parent: RealmWin
+ orderTables:
+ - order: 0
+ window: RealmUpWin
+ - parent: MarketWin
+ orderTables:
+ - order: 0
+ window: MarketDealWin
+ - order: 1
+ window: MarketPutawayWin
+ - order: 2
+ window: MarketDealRecordWin
+ - parent: WelfareWin
+ orderTables:
+ - order: 2
+ window: InSevenDayWin
+ - order: 3
+ window: LevelGiftWin
+ - order: 0
+ window: SignInWin
+ - order: 1
+ window: PrayerWin
+ - order: 4
+ window: AwardExchangeWin
+ - parent: PetWin
+ orderTables:
+ - order: 0
+ window: PetAttributeWin
+ - order: 1
+ window: MountWin
+ - parent: OpenServerActivityWin
+ orderTables:
+ - order: 0
+ window: ImpactRankWin
+ - order: 1
+ window: ConsumeRebateWin
+ - order: 2
+ window: OpenServerRedEnvelopeWin
+ - order: 3
+ window: OSTimeLimitGiftWin
+ - order: 4
+ window: FlashSaleWin
+ - order: 5
+ window: MultipleExpWin
+ - order: 8
+ window: NPracticePointWin
+ - order: 6
+ window: OpenServerGiftWin
+ - order: 9
+ 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
+ - order: 15
+ window: WishingPoolWin
+ - order: 16
+ window: WheelOfFortuneWin
+ - order: 17
+ window: AccumulateRechargeWin
+ - 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: 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
--
Gitblit v1.8.0