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

client_Hale

2018-08-23 b9f6e34d00d2a56f2f52b752c9491529be5ffb55

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

 Assets/Editor/Logo/lxj_android.meta

copy from Assets/Editor/Logo/lxj.meta
copy to Assets/Editor/Logo/lxj_android.meta
File was copied from Assets/Editor/Logo/lxj.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 01e005808a839ab41a7de35f6d789e60
guid: 144cdedd544f26243a4a963ad15dc787
folderAsset: yes
timeCreated: 1533884522
timeCreated: 1535015832
licenseType: Free
DefaultImporter:
  userData: 

 Assets/Editor/Logo/lxj_android/Icon.png

 Assets/Editor/Logo/lxj_android/Icon.png.meta

File was renamed from Assets/Editor/Logo/lxj/Icon.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f9a599944a42e3b46a3a7b0f93bf028c
guid: 09b6f3fe686181a459a6b2c357839189
timeCreated: 1521082299
licenseType: Pro
TextureImporter:

 Assets/Editor/Logo/lxj_android/SplashImage.png

 Assets/Editor/Logo/lxj_android/SplashImage.png.meta

copy from Assets/Editor/Logo/lxj/SplashImage.png.meta
copy to Assets/Editor/Logo/lxj_android/SplashImage.png.meta
File was copied from Assets/Editor/Logo/lxj/SplashImage.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 33633bfb5c6c7bc4db0cc457e200e5ce
guid: e208ee6e6a8032147952e90d4e4e44e9
timeCreated: 1520997354
licenseType: Pro
TextureImporter:

 Assets/Editor/Logo/lxj_android/TB_DL_Logo.png

 Assets/Editor/Logo/lxj_android/TB_DL_Logo.png.meta

copy from Assets/Editor/Logo/lxj/TB_DL_Logo.png.meta
copy to Assets/Editor/Logo/lxj_android/TB_DL_Logo.png.meta
File was copied from Assets/Editor/Logo/lxj/TB_DL_Logo.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 6dc3be5110b15f54bb24359f22975e47
guid: 21c29d38e60357940baaaf843c82b6d9
timeCreated: 1534173665
licenseType: Free
TextureImporter:

 Assets/Editor/Logo/lxj_ios.meta

File was renamed from Assets/Editor/Logo/lxj.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 01e005808a839ab41a7de35f6d789e60
guid: 0b9a6f002a8801145847145e1f3b7618
folderAsset: yes
timeCreated: 1533884522
timeCreated: 1535015832
licenseType: Free
DefaultImporter:
  userData: 

 Assets/Editor/Logo/lxj_ios/Icon.png

 Assets/Editor/Logo/lxj_ios/Icon.png.meta

copy from Assets/Editor/Logo/lxj/Icon.png.meta
copy to Assets/Editor/Logo/lxj_ios/Icon.png.meta
File was copied from Assets/Editor/Logo/lxj/Icon.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f9a599944a42e3b46a3a7b0f93bf028c
guid: 4f7023b8fc847f54083dd0093e693c6a
timeCreated: 1521082299
licenseType: Pro
TextureImporter:

 Assets/Editor/Logo/lxj_ios/SplashImage.png

 Assets/Editor/Logo/lxj_ios/SplashImage.png.meta

File was renamed from Assets/Editor/Logo/lxj/SplashImage.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 33633bfb5c6c7bc4db0cc457e200e5ce
guid: 872256d5dcabd334f9e9834486f8bfa2
timeCreated: 1520997354
licenseType: Pro
TextureImporter:

 Assets/Editor/Logo/lxj_ios/TB_DL_Logo.png

 Assets/Editor/Logo/lxj_ios/TB_DL_Logo.png.meta

File was renamed from Assets/Editor/Logo/lxj/TB_DL_Logo.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 6dc3be5110b15f54bb24359f22975e47
guid: 7413d44474aadf444bff663f4f5e2f99
timeCreated: 1534173665
licenseType: Free
TextureImporter:

 Assets/Editor/VersionConfigs/Versions.txt

@@ -81,10 +81,10 @@
78    djx_28    226114725    1    1.0.12    2128    4    2    0    斗剑仙    com.shandangceshi.snxxz    shandangceshi    shandangceshi2018    shandangceshi    shandangceshi2018        0    0    (-9.5,-286)

79    djx_29    226114725    1    1.0.12    2129    4    2    0    斗剑仙    com.shandangceshi.snxxz    shandangceshi    shandangceshi2018    shandangceshi    shandangceshi2018        0    0    (-9.5,-286)

80    djx_30    226114725    1    1.0.12    2130    4    2    0    斗剑仙    com.shandangceshi.snxxz    shandangceshi    shandangceshi2018    shandangceshi    shandangceshi2018        0    0    (-9.5,-286)

81    lxj    508021130    1    1.0.15    2201    0    1    1    灵仙记    com.zyxhgame.game007    shandangceshi    shandangceshi2018    shandangceshi    shandangceshi2018    7F7BWLXKZR    0    0    (26,139)

81    lxj_ios    508021130    1    1.0.15    2201    0    1    1    灵仙记    com.zyxhgame.game007    shandangceshi    shandangceshi2018    shandangceshi    shandangceshi2018    7F7BWLXKZR    0    0    (26,139)

82    snqxz_1    424064855    1    1.0.15    2301    1    1    1    少年奇侠传    com.zyxhgame.game003    shandangceshi    shandangceshi2018    shandangceshi    shandangceshi2018    5X26T385YZ    0    0    (-15,64)

83    lxj    813015059    1    1.0.15    2401    0    1    1    灵仙记    com.zyxhgame.game007    shandangceshi    shandangceshi2018    shandangceshi    shandangceshi2018        0    0    (26,139)

84    sgsbl_android    815035927    1    1.0.15    2501    0    1    1    上古搜宝录    com.zyxhgame.game005    shandangceshi    shandangceshi2018    shandangceshi    shandangceshi2018        0    0    (40,94)

83    lxj_android    813015059    1    1.0.15    2401    0    1    1    灵仙记    com.ziyouyouxi07.snxxz    shandangceshi    shandangceshi2018    shandangceshi    shandangceshi2018        0    0    (26,139)

84    sgsbl_android    815035927    1    1.0.15    2501    0    1    1    上古搜宝录    com.ziyouyouxi05.snxxz    shandangceshi    shandangceshi2018    shandangceshi    shandangceshi2018        0    0    (40,94)

85    sgsbl_ios    815035853    1    1.0.15    2601    0    1    1    上古搜宝录    com.zyxhgame.game005    shandangceshi    shandangceshi2018    shandangceshi    shandangceshi2018        0    0    (40,94)

997    android_20    822055139    1    1.0.15    2020    999    1    1    少年修仙传    com.ziyouyouxi01.snxxz    shandangceshi    shandangceshi2018    shandangceshi    shandangceshi2018        0    0    (-15,64)

998    snqxz_1    424064855    1    1.0.15    2301    999    1    1    少年奇侠传    com.zyxhgame.game003    shandangceshi    shandangceshi2018    shandangceshi    shandangceshi2018    5X26T385YZ    0    0    (-15,64)


 ProjectSettings/QualitySettings.asset

@@ -4,7 +4,7 @@
QualitySettings:
  m_ObjectHideFlags: 0
  serializedVersion: 5
  m_CurrentQuality: 0
  m_CurrentQuality: 2
  m_QualitySettings:
  - serializedVersion: 2
    name: Fast