Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
36240be7e9
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a17b924be93287241a6159cba93835f3
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2b4ef71599fb5db4a90c6dbb32e0b545
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 7d104c03c89380b4abc3a8a27f1dca6f
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d510e53d62c106b4e813537a2aa88121
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -2020,7 +2020,6 @@ GENERAL_POPUP_TYPE={
|
|||
YiJingBaoKuConfirm = 31,--易经宝库奖励确认
|
||||
LingShouBaoGe = 33,--灵兽宝阁选择神兽
|
||||
YunYouMan = 34,--云游商人选择装备
|
||||
ChooseUpHero = 39,--选择up英雄
|
||||
--大号通用弹窗
|
||||
YiJingBaoKu = 30,--易经宝库
|
||||
YiJingBaoKuRewardPreview = 32,--易经宝库奖励预览
|
||||
|
@ -2030,6 +2029,7 @@ GENERAL_POPUP_TYPE={
|
|||
XiuXingSelectHero = 38,--修行选择英雄弹窗
|
||||
WuJinShuXing = 40,
|
||||
WuJinSetting = 39,
|
||||
ChooseUpHero = 41,--选择up英雄
|
||||
}
|
||||
|
||||
--通用信息弹窗类型
|
||||
|
|
Loading…
Reference in New Issue