From e510a684dde97d142aff869c1f73172054820d67 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 24 六月 2019 12:11:17 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client
---
Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_167.png.meta | 4 ++--
Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_44.png | 0
Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_42.png | 0
Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_44.png.meta | 4 ++--
Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_164.png.meta | 4 ++--
Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_51.png.meta | 4 ++--
Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_104.png.meta | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_104.png.meta b/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_104.png.meta
index b579e1e..91fc63d 100644
--- a/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_104.png.meta
+++ b/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_104.png.meta
@@ -88,5 +88,5 @@
outline: []
spritePackingTag: Recharge
userData:
- assetBundleName: ui/sprite/recharge
+ assetBundleName:
assetBundleVariant:
diff --git a/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_164.png.meta b/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_164.png.meta
index ae0897f..5d7ab6c 100644
--- a/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_164.png.meta
+++ b/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_164.png.meta
@@ -86,7 +86,7 @@
serializedVersion: 2
sprites: []
outline: []
- spritePackingTag: Recharge
+ spritePackingTag:
userData:
- assetBundleName: ui/sprite/recharge
+ assetBundleName:
assetBundleVariant:
diff --git a/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_167.png.meta b/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_167.png.meta
index b1084db..dac5945 100644
--- a/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_167.png.meta
+++ b/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_167.png.meta
@@ -86,7 +86,7 @@
serializedVersion: 2
sprites: []
outline: []
- spritePackingTag: Recharge
+ spritePackingTag:
userData:
- assetBundleName: ui/sprite/recharge
+ assetBundleName:
assetBundleVariant:
diff --git a/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_42.png b/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_42.png
index 96494a5..34199ed 100644
--- a/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_42.png
+++ b/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_42.png
Binary files differ
diff --git a/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_44.png b/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_44.png
index e0540e5..4cbc972 100644
--- a/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_44.png
+++ b/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_44.png
Binary files differ
diff --git a/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_44.png.meta b/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_44.png.meta
index 7d1575f..d88b9b6 100644
--- a/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_44.png.meta
+++ b/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_44.png.meta
@@ -86,7 +86,7 @@
serializedVersion: 2
sprites: []
outline: []
- spritePackingTag: Recharge
+ spritePackingTag:
userData:
- assetBundleName: ui/sprite/recharge
+ assetBundleName:
assetBundleVariant:
diff --git a/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_51.png.meta b/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_51.png.meta
index ab2ee89..538936a 100644
--- a/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_51.png.meta
+++ b/Assets/Editor/RechargeSprites/Pattern_0/XT_VIP_51.png.meta
@@ -86,7 +86,7 @@
serializedVersion: 2
sprites: []
outline: []
- spritePackingTag: Recharge
+ spritePackingTag:
userData:
- assetBundleName: ui/sprite/recharge
+ assetBundleName:
assetBundleVariant:
--
Gitblit v1.8.0