Merge branch 'dev'

2025-12-13 03:30:14 +07:00 · 2021-06-06 04:39:07 +07:00
parent 2db96ff491 6edba87037
commit 38e573ffe9
772 changed files with 433 additions and 1780 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1 @@
-.vs/*
-.vscode/*
-
-obj/*
-Logs/*
-Temp/*
-Library/*
-
-FTSources/.vs/*
-FTSources/FTEditor/obj/*
-FTSources/FTRuntime/obj/*
-FTSources/FTSwfTools/obj/*
-
-AssetStoreTools/*
-AssetStoreTools.meta
-
 .DS_Store
-flash-tools.sln
-flash-tools.userprefs
-Assembly-CSharp.csproj
-Assembly-CSharp-Editor.csproj
--- a/.vimrc
+++ b/.vimrc
@@ -1 +0,0 @@
-let NERDTreeIgnore=['\.meta$']
--- a/Assets/DevTests.meta
+++ b/Assets/DevTests.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 1a21018c206c64008a3d6ac537bae424
-folderAsset: yes
-timeCreated: 1480709520
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations.meta
+++ b/Assets/DevTests/Animations.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: e9d3b19e3144f4203be779cc8292bdc4
-folderAsset: yes
-timeCreated: 1480709536
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests.meta
+++ b/Assets/DevTests/Animations/AlphaTests.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 565ac5dbf45e14b58bcee5aa4f79dca5
-folderAsset: yes
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Alagatar.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Alagatar.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: f6363d3f5b32246409a0e448d693ea63
-folderAsset: yes
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Alagatar/test_anim.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Alagatar/test_anim.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 233da37999237473bbd7a341cec0a3df
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Ducat.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Ducat.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 192763089445348b590df037bd02ba55
-folderAsset: yes
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Ducat/Char.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Ducat/Char.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8ceb9ff9aa4ce47f98257188f83f6dde
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Ducat/Items.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Ducat/Items.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7cc824368c7a14d20add80127d51211b
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Ducat/Jill.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Ducat/Jill.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e58407e38eed44cc69ec3713ede8e8cb
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Ducat/Shield.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Ducat/Shield.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 936cd155c254c405cbfaa7caf5447e69
-timeCreated: 1486882364
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Ducat/WW2.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Ducat/WW2.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e72f5920f43174475a930b2278d2ee68
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Elefun.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Elefun.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 2d8762b6bff92457aa59aaf03193018c
-folderAsset: yes
-timeCreated: 1487860932
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Elefun/android.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Elefun/android.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 489500abc518741b59e7a95b93295317
-timeCreated: 1497866267
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Elefun/open.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Elefun/open.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d481c08b811dc41eda079968a32efbb9
-timeCreated: 1487860937
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Gulev.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Gulev.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 9ec6d4de0dc984d269b15a5b38ed1101
-folderAsset: yes
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Gulev/Secret
+++ b/Assets/DevTests/Animations/AlphaTests/Gulev/Secret
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f454d6a80cf9b452b95be9cceb6063bd
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Gulev/animation.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Gulev/animation.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 52fe01e1d02054956829cb2b0e789c21
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/HsiyaoWang.meta
+++ b/Assets/DevTests/Animations/AlphaTests/HsiyaoWang.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 541c3fcb14f854b1b842b41a866a6f48
-folderAsset: yes
-timeCreated: 1502375163
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/HsiyaoWang/magoichi-test.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/HsiyaoWang/magoichi-test.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e22aa0e3f511949eb89c7ec5ad32c7a3
-timeCreated: 1502375167
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Murlyka.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Murlyka.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: ecb850ee0072945f88b36d507b1a5963
-folderAsset: yes
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Murlyka/DragonSign.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Murlyka/DragonSign.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: cfcf9a00eead44e0e9cf5679295ce6e3
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Murlyka/knight_wip.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Murlyka/knight_wip.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 96d2dc1f0773b4a4286adaa13157f239
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/NSBrotherhood.meta
+++ b/Assets/DevTests/Animations/AlphaTests/NSBrotherhood.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: bafd9a8ab0b7f44b48dde98838d05e80
-folderAsset: yes
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/NSBrotherhood/animation.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/NSBrotherhood/animation.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 83562f86eafdf40fcbd6e9a30a2792cb
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/NSBrotherhood/ball.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/NSBrotherhood/ball.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: be59048140afd47f19a422c5c95c36f7
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Tests.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Tests.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 31fd11df111b54e3dbf8f0b135da45d9
-folderAsset: yes
-timeCreated: 1494224348
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Tests/Characters_1.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Tests/Characters_1.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9b15c852977e54b3b8b1dfc4fa6fc920
-timeCreated: 1495641252
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Tests/FX_overlay.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Tests/FX_overlay.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b037662f7f638455d9cc6d4251710ee2
-timeCreated: 1495627091
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Tests/Torch.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Tests/Torch.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 667a3cd1a987d40d5a4c9b6495da5480
-timeCreated: 1494255165
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Tests/charexp.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Tests/charexp.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 12654680c0cae45d3a44f4fc666262bd
-timeCreated: 1494492625
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Tests/cyclops_test.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Tests/cyclops_test.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7dc9a5d8bf33d4b30b9a58e370cad87e
-timeCreated: 1494508632
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Tests/pyromancer_body.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Tests/pyromancer_body.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0f878ff9c96174385bb57a48f18a6335
-timeCreated: 1495910510
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Tests/pyromancer_ci.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Tests/pyromancer_ci.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c82e30d4e993d450f8a475c408afc80f
-timeCreated: 1495664549
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Tests/pyromancer_head.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Tests/pyromancer_head.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 89dfadc78afc648c3a5aaf39c5cec6e2
-timeCreated: 1495655881
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Tests/pyromancer_head_2.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Tests/pyromancer_head_2.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7c9df19bccf1d4987a1c2359f55b921f
-timeCreated: 1495661693
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Tests/tweens.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Tests/tweens.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3b209e60e405544f2bbdc7a9db61b81d
-timeCreated: 1495206863
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Tests/分镜修改版.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Tests/分镜修改版.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8006ea931faa744169bb2c56d2b04da8
-timeCreated: 1495311730
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Tortuga.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Tortuga.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 02a966e0b597145c69450932ecb2734d
-folderAsset: yes
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Tortuga/Bear.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Tortuga/Bear.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 29c7aa624b715495da989e094be3d74a
-timeCreated: 1480925289
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Tortuga/BoyBlue.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Tortuga/BoyBlue.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d2f337f1d23b34c7183b0bdab2be2833
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Tortuga/archer.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Tortuga/archer.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9f464cd15971b499b84dfb236de754b3
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Tortuga/boy_1_1.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Tortuga/boy_1_1.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c20b2fab1e7424e619bc9d35f033b139
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Tortuga/cyclop.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Tortuga/cyclop.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b35790b065a454a32a0518138e64d15f
-timeCreated: 1491582789
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Tortuga/fairy.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Tortuga/fairy.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2d6dfc6c87f354cd38fa880c28c283c6
-timeCreated: 1516990362
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Tortuga/hero_pirate.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Tortuga/hero_pirate.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 55c438c941e894f25bb2b0527ee72f7c
-timeCreated: 1486989506
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Tortuga/peasant.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Tortuga/peasant.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 940681d2fa46441fa981bde55d8ea65d
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Tortuga/pyromancer.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Tortuga/pyromancer.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3104ee5a145db4918a96ff768b551b65
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/AlphaTests/Tortuga/soulreaper.fla.meta
+++ b/Assets/DevTests/Animations/AlphaTests/Tortuga/soulreaper.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 672cf0095a3044ff298e605979974aa6
-timeCreated: 1486823787
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/BugTests.meta
+++ b/Assets/DevTests/Animations/BugTests.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 0af1635387aab4e9cb5b38d8722cecf0
-folderAsset: yes
-timeCreated: 1511462526
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/BugTests/Liklain_Unity_Forum.meta
+++ b/Assets/DevTests/Animations/BugTests/Liklain_Unity_Forum.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 78561fafa47094aea89ba0771c70c41b
-folderAsset: yes
-timeCreated: 1511482664
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/BugTests/Liklain_Unity_Forum/blockers_tmp_0.fla.meta
+++ b/Assets/DevTests/Animations/BugTests/Liklain_Unity_Forum/blockers_tmp_0.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5cecc5a6be854444ea6d0ee1bac1925f
-timeCreated: 1511482664
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/BugTests/Liklain_Unity_Forum/blockers_tmp_0.txt
+++ b/Assets/DevTests/Animations/BugTests/Liklain_Unity_Forum/blockers_tmp_0.txt
@@ -1 +0,0 @@
-> [FlashTools]</b> Parsing swf error: Failed to read past end of stream.
--- a/Assets/DevTests/Animations/BugTests/Liklain_Unity_Forum/blockers_tmp_0.txt.meta
+++ b/Assets/DevTests/Animations/BugTests/Liklain_Unity_Forum/blockers_tmp_0.txt.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 056a3e8eb97b34881be36dd1944cce02
-timeCreated: 1511482664
-licenseType: Free
-TextScriptImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/BugTests/Vasilii_Manoilov_Skype.meta
+++ b/Assets/DevTests/Animations/BugTests/Vasilii_Manoilov_Skype.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: a63f9772f8c46490c99d421c9b89b497
-folderAsset: yes
-timeCreated: 1511483868
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/BugTests/Vasilii_Manoilov_Skype/mapResources.fla.meta
+++ b/Assets/DevTests/Animations/BugTests/Vasilii_Manoilov_Skype/mapResources.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1a360ba863a804a399e9cc7a7bf9885f
-timeCreated: 1511485563
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/BugTests/Vasilii_Manoilov_Skype/mapResources.txt
+++ b/Assets/DevTests/Animations/BugTests/Vasilii_Manoilov_Skype/mapResources.txt
@@ -1,3 +0,0 @@
-Привет!
-Принимай материал для исследования)
-После конвертации получаем файл swf, но он не обрабатывается в Unity, пишет: http://prntscr.com/he4tv1
--- a/Assets/DevTests/Animations/BugTests/Vasilii_Manoilov_Skype/mapResources.txt.meta
+++ b/Assets/DevTests/Animations/BugTests/Vasilii_Manoilov_Skype/mapResources.txt.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7db3e6a1b84754816afc32bb06622e8b
-timeCreated: 1511485563
-licenseType: Free
-TextScriptImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/FeatureTests.meta
+++ b/Assets/DevTests/Animations/FeatureTests.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 478028c685206498d8d3bad9b40ab1ca
-folderAsset: yes
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/FeatureTests/0_keyframes.fla.meta
+++ b/Assets/DevTests/Animations/FeatureTests/0_keyframes.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ac063efa6d36646a6a2c95bb8238f5d9
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/FeatureTests/10_unlocks.fla.meta
+++ b/Assets/DevTests/Animations/FeatureTests/10_unlocks.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1c95e140e6cc841508d2f6a21b33068b
-timeCreated: 1495287492
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/FeatureTests/1_colormode.fla.meta
+++ b/Assets/DevTests/Animations/FeatureTests/1_colormode.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e88113127ac2948d7ae43830f9d3b474
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/FeatureTests/2_transforms.fla.meta
+++ b/Assets/DevTests/Animations/FeatureTests/2_transforms.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6c5fcdc07abfe4c4c854981c46fc87f0
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/FeatureTests/3_visible.fla.meta
+++ b/Assets/DevTests/Animations/FeatureTests/3_visible.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: cda27b0f387ac473caa351ef8f0397a0
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/FeatureTests/4_blends.fla.meta
+++ b/Assets/DevTests/Animations/FeatureTests/4_blends.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d4b55f0af2b0f4500befed88ac402ea7
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/FeatureTests/5.1_rasterization.fla.meta
+++ b/Assets/DevTests/Animations/FeatureTests/5.1_rasterization.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0d13ae1d44c104550839d382b285d6ce
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/FeatureTests/5_rasterization.fla.meta
+++ b/Assets/DevTests/Animations/FeatureTests/5_rasterization.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5cd05761509a14c9895dc6fa4bad0697
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/FeatureTests/6.1_masks.fla.meta
+++ b/Assets/DevTests/Animations/FeatureTests/6.1_masks.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e1886fe1005814f84b209c1ed51e2db9
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/FeatureTests/6_masks.fla.meta
+++ b/Assets/DevTests/Animations/FeatureTests/6_masks.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 620e9951dbce948179a322e6cc9e3ee7
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/FeatureTests/7_filters.fla.meta
+++ b/Assets/DevTests/Animations/FeatureTests/7_filters.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 785e915ad20c44aab9661a9e8ee42ffd
-timeCreated: 1480709899
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/FeatureTests/8_labels.fla.meta
+++ b/Assets/DevTests/Animations/FeatureTests/8_labels.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6a5952dba743d4595a83376fa4484f59
-timeCreated: 1480710495
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/FeatureTests/9.1_groups.fla.meta
+++ b/Assets/DevTests/Animations/FeatureTests/9.1_groups.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ad3f6a723d9604fe9b44fe73494e6899
-timeCreated: 1494279688
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/FeatureTests/9.2_groups.fla.meta
+++ b/Assets/DevTests/Animations/FeatureTests/9.2_groups.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 221b4d2156b3446cbbf03c70db9e69fd
-timeCreated: 1495746942
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/FeatureTests/9.3_groups.fla.meta
+++ b/Assets/DevTests/Animations/FeatureTests/9.3_groups.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 16c36ac5146fc41799851c3b081b6846
-timeCreated: 1495749347
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/FeatureTests/9.4_groups.fla.meta
+++ b/Assets/DevTests/Animations/FeatureTests/9.4_groups.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 137690fcc02e7478f8f0c6733fe7889c
-timeCreated: 1495903354
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Animations/FeatureTests/9_groups.fla.meta
+++ b/Assets/DevTests/Animations/FeatureTests/9_groups.fla.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 95dbb06a4f0c9413480c9e92aba982d3
-timeCreated: 1494272922
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Scene.unity
+++ b/Assets/DevTests/Scene.unity
@@ -1,196 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
-OcclusionCullingSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_OcclusionBakeSettings:
-    smallestOccluder: 5
-    smallestHole: 0.25
-    backfaceThreshold: 100
-  m_SceneGUID: 00000000000000000000000000000000
-  m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
-RenderSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 8
-  m_Fog: 0
-  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
-  m_FogMode: 3
-  m_FogDensity: 0.01
-  m_LinearFogStart: 0
-  m_LinearFogEnd: 300
-  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
-  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
-  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
-  m_AmbientIntensity: 1
-  m_AmbientMode: 3
-  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
-  m_SkyboxMaterial: {fileID: 0}
-  m_HaloStrength: 0.5
-  m_FlareStrength: 1
-  m_FlareFadeSpeed: 3
-  m_HaloTexture: {fileID: 0}
-  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
-  m_DefaultReflectionMode: 0
-  m_DefaultReflectionResolution: 128
-  m_ReflectionBounces: 1
-  m_ReflectionIntensity: 1
-  m_CustomReflection: {fileID: 0}
-  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
--- !u!157 &3
-LightmapSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 11
-  m_GIWorkflowMode: 1
-  m_GISettings:
-    serializedVersion: 2
-    m_BounceScale: 1
-    m_IndirectOutputScale: 1
-    m_AlbedoBoost: 1
-    m_TemporalCoherenceThreshold: 1
-    m_EnvironmentLightingMode: 0
-    m_EnableBakedLightmaps: 0
-    m_EnableRealtimeLightmaps: 0
-  m_LightmapEditorSettings:
-    serializedVersion: 9
-    m_Resolution: 2
-    m_BakeResolution: 40
-    m_TextureWidth: 1024
-    m_TextureHeight: 1024
-    m_AO: 0
-    m_AOMaxDistance: 1
-    m_CompAOExponent: 0
-    m_CompAOExponentDirect: 0
-    m_Padding: 2
-    m_LightmapParameters: {fileID: 0}
-    m_LightmapsBakeMode: 1
-    m_TextureCompression: 1
-    m_FinalGather: 0
-    m_FinalGatherFiltering: 1
-    m_FinalGatherRayCount: 1024
-    m_ReflectionCompression: 2
-    m_MixedBakeMode: 1
-    m_BakeBackend: 0
-    m_PVRSampling: 1
-    m_PVRDirectSampleCount: 32
-    m_PVRSampleCount: 500
-    m_PVRBounces: 2
-    m_PVRFilterTypeDirect: 0
-    m_PVRFilterTypeIndirect: 0
-    m_PVRFilterTypeAO: 0
-    m_PVRFilteringMode: 0
-    m_PVRCulling: 1
-    m_PVRFilteringGaussRadiusDirect: 1
-    m_PVRFilteringGaussRadiusIndirect: 5
-    m_PVRFilteringGaussRadiusAO: 2
-    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
-    m_PVRFilteringAtrousPositionSigmaIndirect: 2
-    m_PVRFilteringAtrousPositionSigmaAO: 1
-    m_ShowResolutionOverlay: 1
-  m_LightingDataAsset: {fileID: 0}
-  m_UseShadowmask: 0
--- !u!196 &4
-NavMeshSettings:
-  serializedVersion: 2
-  m_ObjectHideFlags: 0
-  m_BuildSettings:
-    serializedVersion: 2
-    agentTypeID: 0
-    agentRadius: 0.5
-    agentHeight: 2
-    agentSlope: 45
-    agentClimb: 0.4
-    ledgeDropHeight: 0
-    maxJumpAcrossDistance: 0
-    minRegionArea: 2
-    manualCellSize: 0
-    cellSize: 0.16666667
-    manualTileSize: 0
-    tileSize: 256
-    accuratePlacement: 0
-    debug:
-      m_Flags: 0
-  m_NavMeshData: {fileID: 0}
--- !u!1 &1173114888
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 1173114893}
-  - component: {fileID: 1173114892}
-  - component: {fileID: 1173114890}
-  - component: {fileID: 1173114889}
-  m_Layer: 0
-  m_Name: Main Camera
-  m_TagString: MainCamera
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!81 &1173114889
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1173114888}
-  m_Enabled: 1
--- !u!124 &1173114890
-Behaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1173114888}
-  m_Enabled: 1
--- !u!20 &1173114892
-Camera:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1173114888}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844}
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 1
-  orthographic size: 3
-  m_Depth: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 0
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
--- !u!4 &1173114893
-Transform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1173114888}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -10}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/Assets/DevTests/Scene.unity.meta
+++ b/Assets/DevTests/Scene.unity.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8ce0e3cb67ade4279a5eedf786d19ca7
-timeCreated: 1480709959
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Scripts.meta
+++ b/Assets/DevTests/Scripts.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 1d9cc4715a6c54bbba3e47c8c773d3c5
-folderAsset: yes
-timeCreated: 1480709552
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/DevTests/Scripts/EchoEventListener.cs.meta
+++ b/Assets/DevTests/Scripts/EchoEventListener.cs.meta
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 38f0f7dc068694fccbf1740118107b65
-timeCreated: 1480885888
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/ProjectStuff/FlashTools.org
+++ b/ProjectStuff/FlashTools.org
--- a/DevStuff/Promo/Promo1/Guide/1.png
+++ b/DevStuff/Promo/Promo1/Guide/1.png
--- a/DevStuff/Promo/Promo1/Guide/10.png
+++ b/DevStuff/Promo/Promo1/Guide/10.png
--- a/DevStuff/Promo/Promo1/Guide/2.png
+++ b/DevStuff/Promo/Promo1/Guide/2.png
--- a/DevStuff/Promo/Promo1/Guide/3.png
+++ b/DevStuff/Promo/Promo1/Guide/3.png
--- a/DevStuff/Promo/Promo1/Guide/4.png
+++ b/DevStuff/Promo/Promo1/Guide/4.png
--- a/DevStuff/Promo/Promo1/Guide/5.png
+++ b/DevStuff/Promo/Promo1/Guide/5.png
--- a/DevStuff/Promo/Promo1/Guide/6.png
+++ b/DevStuff/Promo/Promo1/Guide/6.png
--- a/DevStuff/Promo/Promo1/Guide/7.png
+++ b/DevStuff/Promo/Promo1/Guide/7.png
--- a/DevStuff/Promo/Promo1/Guide/8.png
+++ b/DevStuff/Promo/Promo1/Guide/8.png
--- a/DevStuff/Promo/Promo1/Guide/9.png
+++ b/DevStuff/Promo/Promo1/Guide/9.png
--- a/DevStuff/Promo/Promo1/Icon.psd
+++ b/DevStuff/Promo/Promo1/Icon.psd
--- a/DevStuff/Promo/Promo1/Icon2.psd
+++ b/DevStuff/Promo/Promo1/Icon2.psd
--- a/DevStuff/Promo/Promo1/Icons/BigBigIcon_1200x630.png
+++ b/DevStuff/Promo/Promo1/Icons/BigBigIcon_1200x630.png
--- a/DevStuff/Promo/Promo1/Icons/BigIcon.png
+++ b/DevStuff/Promo/Promo1/Icons/BigIcon.png
--- a/DevStuff/Promo/Promo1/Icons/BigIcon_200x258.png
+++ b/DevStuff/Promo/Promo1/Icons/BigIcon_200x258.png
--- a/DevStuff/Promo/Promo1/Icons/BlogIcon.png
+++ b/DevStuff/Promo/Promo1/Icons/BlogIcon.png
--- a/DevStuff/Promo/Promo1/Icons/Icon4_128x128.png
+++ b/DevStuff/Promo/Promo1/Icons/Icon4_128x128.png
--- a/DevStuff/Promo/Promo1/NewIcons/Icon_1200x630.png
+++ b/DevStuff/Promo/Promo1/NewIcons/Icon_1200x630.png
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`> [FlashTools]</b> Parsing swf error: Failed to read past end of stream.`