Merge branch 'RechargeWin' of http://192.168.0.87:10010/r/snxxz_client into...

client_Wu Xijin

2019-01-08 0a435da782056a1474a8bc0fccb76431db76a879

Merge branch 'RechargeWin' of http://192.168.0.87:10010/r/snxxz_client into RechargeWin

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_104.png

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_104.png.meta

copy from "Assets/Editor/RechargeSprites/Pattern_1/\347\273\221\347\216\211\350\265\240\351\200\201\345\272\225\346\241\206.png.meta"
copy to Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_104.png.meta
File was copied from Assets/Editor/RechargeSprites/Pattern_1/绑玉赠送底框.png.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: c34e1208fd328cc43aa3787af7af3ec0
timeCreated: 1546678740
licenseType: Pro
guid: f266ab7f68cd1674db56326d0c50b5d4
timeCreated: 1546912448
licenseType: Free
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_115.png

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_115.png.meta

copy from "Assets/Editor/RechargeSprites/Pattern_1/\347\273\221\347\216\211\350\265\240\351\200\201\345\272\225\346\241\206.png.meta"
copy to Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_115.png.meta
File was copied from Assets/Editor/RechargeSprites/Pattern_1/绑玉赠送底框.png.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: c34e1208fd328cc43aa3787af7af3ec0
timeCreated: 1546678740
licenseType: Pro
guid: 8e0f1cdd03de2db448afefd9d0bb2366
timeCreated: 1546912440
licenseType: Free
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_161.png

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_161.png.meta

copy from "Assets/Editor/RechargeSprites/Pattern_1/\347\273\221\347\216\211\350\265\240\351\200\201\345\272\225\346\241\206.png.meta"
copy to Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_161.png.meta
File was copied from Assets/Editor/RechargeSprites/Pattern_1/绑玉赠送底框.png.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: c34e1208fd328cc43aa3787af7af3ec0
timeCreated: 1546678740
licenseType: Pro
guid: d0c459d38934d274e9b27fc24c7b2d00
timeCreated: 1546912443
licenseType: Free
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_27.png

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_27.png.meta

copy from "Assets/Editor/RechargeSprites/Pattern_1/\347\273\221\347\216\211\350\265\240\351\200\201\345\272\225\346\241\206.png.meta"
copy to Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_27.png.meta
File was copied from Assets/Editor/RechargeSprites/Pattern_1/绑玉赠送底框.png.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: c34e1208fd328cc43aa3787af7af3ec0
timeCreated: 1546678740
licenseType: Pro
guid: ef9098bc7d2088b41a069141bf52e695
timeCreated: 1546912448
licenseType: Free
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_36.png

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_36.png.meta

copy from "Assets/Editor/RechargeSprites/Pattern_1/\347\273\221\347\216\211\350\265\240\351\200\201\345\272\225\346\241\206.png.meta"
copy to Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_36.png.meta
File was copied from Assets/Editor/RechargeSprites/Pattern_1/绑玉赠送底框.png.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: c34e1208fd328cc43aa3787af7af3ec0
timeCreated: 1546678740
licenseType: Pro
guid: db8bd77d83022254e8385869b2aab544
timeCreated: 1546912446
licenseType: Free
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_42.png

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_42.png.meta

copy from "Assets/Editor/RechargeSprites/Pattern_1/\347\273\221\347\216\211\350\265\240\351\200\201\345\272\225\346\241\206.png.meta"
copy to Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_42.png.meta
File was copied from Assets/Editor/RechargeSprites/Pattern_1/绑玉赠送底框.png.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: c34e1208fd328cc43aa3787af7af3ec0
timeCreated: 1546678740
licenseType: Pro
guid: c89ec073876b1d445a5e6ff84cf77775
timeCreated: 1546912441
licenseType: Free
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_43.png

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_43.png.meta

copy from "Assets/Editor/RechargeSprites/Pattern_1/\347\273\221\347\216\211\350\265\240\351\200\201\345\272\225\346\241\206.png.meta"
copy to Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_43.png.meta
File was copied from Assets/Editor/RechargeSprites/Pattern_1/绑玉赠送底框.png.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: c34e1208fd328cc43aa3787af7af3ec0
timeCreated: 1546678740
licenseType: Pro
guid: e0081ad1b82e9bf42a813bbd1c5ed4d0
timeCreated: 1546912446
licenseType: Free
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_44.png

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_44.png.meta

copy from "Assets/Editor/RechargeSprites/Pattern_1/\347\273\221\347\216\211\350\265\240\351\200\201\345\272\225\346\241\206.png.meta"
copy to Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_44.png.meta
File was copied from Assets/Editor/RechargeSprites/Pattern_1/绑玉赠送底框.png.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: c34e1208fd328cc43aa3787af7af3ec0
timeCreated: 1546678740
licenseType: Pro
guid: 7f973f7c9a3d1cf48b1bdfe6d2e36243
timeCreated: 1546912438
licenseType: Free
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_45.png

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_45.png.meta

copy from "Assets/Editor/RechargeSprites/Pattern_1/\347\273\221\347\216\211\350\265\240\351\200\201\345\272\225\346\241\206.png.meta"
copy to Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_45.png.meta
File was copied from Assets/Editor/RechargeSprites/Pattern_1/绑玉赠送底框.png.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: c34e1208fd328cc43aa3787af7af3ec0
timeCreated: 1546678740
licenseType: Pro
guid: dbe6d34c1f731974b95af51057df2694
timeCreated: 1546912446
licenseType: Free
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_46.png

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_46.png.meta

File was renamed from Assets/Editor/RechargeSprites/Pattern_1/绑玉赠送底框.png.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: c34e1208fd328cc43aa3787af7af3ec0
timeCreated: 1546678740
licenseType: Pro
guid: e8c8e463236974c4499ac84ae4109683
timeCreated: 1546912447
licenseType: Free
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_51.png

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_51.png.meta

copy from "Assets/Editor/RechargeSprites/Pattern_1/\347\273\221\347\216\211\350\265\240\351\200\201\345\272\225\346\241\206.png.meta"
copy to Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_51.png.meta
File was copied from Assets/Editor/RechargeSprites/Pattern_1/绑玉赠送底框.png.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: c34e1208fd328cc43aa3787af7af3ec0
timeCreated: 1546678740
licenseType: Pro
guid: 8a6d69eb7102baf43a819f9f7276b461
timeCreated: 1546912440
licenseType: Free
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_63.png

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_63.png.meta

copy from "Assets/Editor/RechargeSprites/Pattern_1/\347\273\221\347\216\211\350\265\240\351\200\201\345\272\225\346\241\206.png.meta"
copy to Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_63.png.meta
File was copied from Assets/Editor/RechargeSprites/Pattern_1/绑玉赠送底框.png.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: c34e1208fd328cc43aa3787af7af3ec0
timeCreated: 1546678740
licenseType: Pro
guid: 7042c525fb3e01e42b03155bf530b1e0
timeCreated: 1546912437
licenseType: Free
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_68.png

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_68.png.meta

copy from "Assets/Editor/RechargeSprites/Pattern_1/\347\273\221\347\216\211\350\265\240\351\200\201\345\272\225\346\241\206.png.meta"
copy to Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_68.png.meta
File was copied from Assets/Editor/RechargeSprites/Pattern_1/绑玉赠送底框.png.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: c34e1208fd328cc43aa3787af7af3ec0
timeCreated: 1546678740
licenseType: Pro
guid: 2ed2936c53254b642bed50757c1cc567
timeCreated: 1546912436
licenseType: Free
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_69.png

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_69.png.meta

copy from "Assets/Editor/RechargeSprites/Pattern_1/\347\273\221\347\216\211\350\265\240\351\200\201\345\272\225\346\241\206.png.meta"
copy to Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_69.png.meta
File was copied from Assets/Editor/RechargeSprites/Pattern_1/绑玉赠送底框.png.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: c34e1208fd328cc43aa3787af7af3ec0
timeCreated: 1546678740
licenseType: Pro
guid: 992016c919a1b1742904e53e5e02793e
timeCreated: 1546912440
licenseType: Free
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_70.png

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_70.png.meta

copy from "Assets/Editor/RechargeSprites/Pattern_1/\347\273\221\347\216\211\350\265\240\351\200\201\345\272\225\346\241\206.png.meta"
copy to Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_70.png.meta
File was copied from Assets/Editor/RechargeSprites/Pattern_1/绑玉赠送底框.png.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: c34e1208fd328cc43aa3787af7af3ec0
timeCreated: 1546678740
licenseType: Pro
guid: 21db4abd4e2ba0a468fb3c66960b40f1
timeCreated: 1546912436
licenseType: Free
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_71.png

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_71.png.meta

copy from "Assets/Editor/RechargeSprites/Pattern_1/\347\273\221\347\216\211\350\265\240\351\200\201\345\272\225\346\241\206.png.meta"
copy to Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_71.png.meta
File was copied from Assets/Editor/RechargeSprites/Pattern_1/绑玉赠送底框.png.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: c34e1208fd328cc43aa3787af7af3ec0
timeCreated: 1546678740
licenseType: Pro
guid: ab58640cc6ea9bc4694c57c9a0725e71
timeCreated: 1546912441
licenseType: Free
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_72.png

 Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_72.png.meta

copy from "Assets/Editor/RechargeSprites/Pattern_1/\347\273\221\347\216\211\350\265\240\351\200\201\345\272\225\346\241\206.png.meta"
copy to Assets/Editor/RechargeSprites/Pattern_1/XT_VIP_72.png.meta
File was copied from Assets/Editor/RechargeSprites/Pattern_1/绑玉赠送底框.png.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: c34e1208fd328cc43aa3787af7af3ec0
timeCreated: 1546678740
licenseType: Pro
guid: 8845fa0f271e9eb4eacd781f504e518b
timeCreated: 1546912438
licenseType: Free
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4

 Assets/Editor/RechargeSprites/Pattern_1/vip装饰1.png.meta

File was deleted

 Assets/Editor/RechargeSprites/Pattern_1/vip装饰2.png.meta

File was deleted

 Assets/Editor/RechargeSprites/Pattern_1/充值选项红底.png

Binary files differ

 Assets/Editor/RechargeSprites/Pattern_1/充值选项红底.png.meta

File was deleted

 Assets/Editor/RechargeSprites/Pattern_1/屋檐.png.meta

File was deleted

 Assets/Editor/RechargeSprites/Pattern_1/底部资源框.png.meta

File was deleted

 Assets/Editor/RechargeSprites/Pattern_1/按钮.png.meta

File was deleted

 Assets/Editor/RechargeSprites/Pattern_1/暗纹.png

Binary files differ

 Assets/Editor/RechargeSprites/Pattern_1/暗纹.png.meta

File was deleted

 Assets/Editor/RechargeSprites/Pattern_1/未选中.png.meta

File was deleted

 Assets/Editor/RechargeSprites/Pattern_1/标题底(不压缩).png.meta

File was deleted

 Assets/Editor/RechargeSprites/Pattern_1/神兵宝箱底.png.meta

File was deleted

 Assets/Editor/RechargeSprites/Pattern_1/装饰花.png.meta

File was deleted

 Assets/Editor/RechargeSprites/Pattern_1/选中.png.meta

File was deleted

 Assets/Editor/RechargeSprites/Pattern_1/选项底框.png

Binary files differ

 Assets/Editor/RechargeSprites/Pattern_1/选项底框.png.meta

File was deleted

 Assets/Editor/RechargeSprites/Pattern_1/首充双倍.png.meta

File was deleted

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_104.png

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_104.png.meta

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_115.png

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_115.png.meta

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_161.png

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_161.png.meta

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_27.png

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_27.png.meta

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_36.png

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_36.png.meta

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_42.png

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_42.png.meta

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_43.png

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_43.png.meta

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_44.png

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_44.png.meta

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_45.png

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_45.png.meta

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_46.png

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_46.png.meta

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_51.png

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_51.png.meta

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_63.png

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_63.png.meta

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_68.png

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_68.png.meta

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_69.png

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_69.png.meta

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_70.png

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_70.png.meta

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_71.png

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_71.png.meta

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_72.png

 Assets/Editor/RechargeSprites/Pattern_2/XT_VIP_72.png.meta

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_104.png

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_104.png.meta

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_115.png

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_115.png.meta

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_161.png

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_161.png.meta

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_27.png

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_27.png.meta

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_36.png

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_36.png.meta

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_42.png

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_42.png.meta

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_43.png

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_43.png.meta

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_44.png

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_44.png.meta

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_45.png

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_45.png.meta

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_46.png

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_46.png.meta

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_51.png

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_51.png.meta

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_63.png

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_63.png.meta

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_68.png

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_68.png.meta

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_69.png

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_69.png.meta

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_70.png

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_70.png.meta

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_71.png

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_71.png.meta

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_72.png

 Assets/Editor/RechargeSprites/Pattern_3/XT_VIP_72.png.meta