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

CeHua_ZWJ

2018-09-18 b40679325a7a1607aba9856ec5299f47e77221fb

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

 Assets/Editor/Logo/djxxz/Launch.png

 Assets/Editor/Logo/djxxz/Launch.png.meta

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: b90e5ec5bd97e5542aedd19dbe1b0aaf
guid: a7c80db3c6f2ca8409adbf9014275f71
timeCreated: 1535531960
licenseType: Free
TextureImporter:

 Assets/Editor/Logo/djxxz/SplashImage.png

 Assets/Editor/Logo/djxxz/TB_DL_Logo.png

 Assets/Resources/Config/PriorLanguage.txt

@@ -26,4 +26,7 @@
23    

24    网络未链接，无法下载

25    您已经完成了所有游戏资源的下载，收下这份薄礼吧。



26    <color=#fa0101>爆满</color>

27    <color=#ffba00>繁忙</color>

28    <color=#35e122>流畅</color>

29    <color=#d5d5d5>维护</color>


 Assets/Resources/ScriptableObject/Config/WindowConfig.asset

@@ -74,10 +74,8 @@
    orderTables:
    - order: 0
      window: DemonJarWin
    - order: 1
      window: FairyGrabBossWin
    - order: 2
      window: FairyGrabBossWin
      window: DogzDungeonWin
  - parent: UnionPanel
    orderTables:
    - order: 2
@@ -118,6 +116,8 @@
      window: PetAttributeWin
    - order: 1
      window: MountWin
    - order: 2
      window: FairyGrabBossWin
  - parent: OpenServerActivityWin
    orderTables:
    - order: 0