阵营命修改 上传一部分杂乱的mat

ShaoNv
PC-202302260912\Administrator 2024-09-06 19:30:37 +08:00
parent d8b54eaee0
commit 7e7b86d35e
89 changed files with 192 additions and 191 deletions

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/dyact_activity5
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/expeditionnewatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/exploreatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/faxiangaltas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/flyupatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/gmaltas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/gematlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName: lz4/atlas/zhizunhaoliatlas
assetBundleName: lz4/atlas/godsoulatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/godweaponatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/godswaytoweratlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/heroatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/homelandatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/hotrankatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/incarnationatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/journeywithwindatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/likabilityatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/lingmaimijingatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/linglongatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/newshenzunatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/newtipbgaltas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/powerriceatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/qijieshilianatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/sacredtreeatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/surpriseboxatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/taichumijuan
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/tailsmansoulatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/tehuishenzhuangatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/tiandihongluatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/weekcardatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/worldarena
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/xunbaomizong
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/yujianxingatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/zhoukaatlas
assetBundleVariant: unity3d

View File

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/atlas/shenzun
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/bgm/bgm-battle06
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/actor_voc/audio_ab_jn_s1_01
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/actor_voc/audio_yj_jn_01
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/actor_voc/audio_yj_jn_02
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/actor_voc/audio_zn_jn_01
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/actor_voc/audio_zn_jn_02
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_c_xy_0012_skeff_tapsk_healeff
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_negw_skin01_01
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_negw_skin01_02
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_niu_attack_01
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_niu_hit_01
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_normal_effect_02
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_normal_effect_03
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_normal_effect_04
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_normal_effect_05
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_normal_effect_06
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_normal_effect_dao1_attack
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_normal_effect_dao3_hit
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_normal_effect_dao_attack
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_normal_effect_dao_hit
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_normal_effect_fo_attack
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_normal_effect_fo_hit
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_normal_effect_ren_attack
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_normal_effect_ren_hit
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_normal_effect_yao3_attack
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_normal_effect_yao3_hit
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_normal_effect_yao_attack
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_normal_effect_yao_hit
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_jn_jz_1
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_jn_jz_2
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_jn_yhdd_s1_1
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_jn_yhdd_s1_2
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/skill/skill/audio_pg_yhdd
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/ui/common/audio_c_skr_0028_skeff_slidesk_attacked
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/ui/voice/audio_fangcunzhuanpan_0
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/ui/voice/audio_fangcunzhuanpan_1
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/ui/voice/audio_linglongbaojing_gaoguang_huaban_001
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/ui/voice/audio_linglongbaojing_kaiqi_002
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/ui/voice/audio_linglongbaojing_lianhuaxiazhui_003
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/ui/voice/audio_linglongbaojing_longmengezi_004
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/ui/voice/audio_linglongbaojing_longpanxuan_005
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/ui/voice/audio_linglongbaojing_longsaoguang_006
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/ui/voice/audio_linglongbaojing_neiquanlunge_007
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/ui/voice/audio_linglongbaojing_waiquandianliang_008
assetBundleVariant: unity3d

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/audio/ui/voice/audio_linglongbaojing_waiquanlunge_009
assetBundleVariant: unity3d

View File

@ -106,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/bg/bg_hz_leichong_01
assetBundleVariant: unity3d

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/bg/bg_hz_leichong_02
assetBundleVariant: unity3d

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/bg/bg_hz_qiandao_01
assetBundleVariant: unity3d

View File

@ -117,5 +117,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/bg/bg_hz_qiandao_02
assetBundleVariant: unity3d

View File

@ -106,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/bg/bg_hz_qiandao_03
assetBundleVariant: unity3d

View File

@ -106,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
assetBundleName: lz4/bg/bg_hz_qiandao_04
assetBundleVariant: unity3d

View File

@ -3046,7 +3046,7 @@ BATTLE_TYPE = {
}
--isRankingMainPanelShow_1 本服 _2 跨服 3_跨服不显示在排行主界面 4 用于十绝阵特殊判断 --0非跨服界面内排行榜(达人)
--本服排行
rankKingList={ [1] = { bgImage = "UI_hz_ls_47", name = "星数排行" ,rankType = RANK_TYPE.FIGHTLEVEL_STAR,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 1,showBg="UI_hz_ls_54"},
rankKingList={ [1] = { bgImage = "UI_hz_ls_47", name = "星数排行" ,rankType = RANK_TYPE.FIGHTLEVEL_STAR,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 1,showBg="Dragon Ball七龙珠- (31)"},
[2] = { bgImage = "UI_hz_ls_49", name = Language[12097] ,rankType = RANK_TYPE.FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 2,showBg="UI_hz_ls_53"},
[3] = { bgImage = "UI_hz_ls_48", name = Language[12098] ,rankType = RANK_TYPE.GUILD_FORCE_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 3,showBg="UI_hz_ls_52"},
[4] = { bgImage = "UI_hz_ls_50", name = Language[12099] ,rankType = RANK_TYPE.MONSTER_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 4,showBg="UI_hz_ls_51"},
@ -3401,10 +3401,10 @@ CardPosImageName = {
PropertyType = {
[0] = "全部",
[1] = "海军",
[2] = "海贼",
[3] = "四皇",
[4] = "强者",
[1] = "灼烧",
[2] = "暴伤",
[3] = "永动",
[4] = "控怒",
[5] = "传奇",
}
@ -3416,10 +3416,10 @@ ProfessionType = {
}
PropertyTypeImageBySiYuan = {
[1] = {image3 = "y_yuansu_ren01_zh",Image1 = "y_yuansu_ren",property = ""},
[2] = {image3 = "y_yuansu_fou01_zh",Image1 = "y_yuansu_fou",property = ""},
[3] = {image3 = "y_yuansu_yao01_zh",Image1 = "y_yuansu_yao",property = ""},
[4] = {image3 = "y_yuansu_dao01_zh",Image1 = "y_yuansu_dao",property = ""},
[1] = {image3 = "y_yuansu_ren01_zh",Image1 = "y_yuansu_ren",property = "灼烧"},
[2] = {image3 = "y_yuansu_fou01_zh",Image1 = "y_yuansu_fou",property = "暴伤"},
[3] = {image3 = "y_yuansu_yao01_zh",Image1 = "y_yuansu_yao",property = "永动"},
[4] = {image3 = "y_yuansu_dao01_zh",Image1 = "y_yuansu_dao",property = "控怒"},
}
NumToChinese = {

View File

@ -325,14 +325,14 @@ Language = {
[10324] = GetLanguageStrById("今日还可以重置"),
[10325] = GetLanguageStrById("重置成功"),
[10326] = GetLanguageStrById("需要上阵%s名%s系英雄"),
[10327] = GetLanguageStrById("海军"),
[10328] = GetLanguageStrById("海贼"),
[10329] = GetLanguageStrById("四皇"),
[10330] = GetLanguageStrById("强者"),
[10331] = GetLanguageStrById("海军宝藏"),
[10332] = GetLanguageStrById("海贼宝藏"),
[10333] = GetLanguageStrById("四皇宝藏"),
[10334] = GetLanguageStrById("强者宝藏"),
[10327] = GetLanguageStrById("灼烧"),
[10328] = GetLanguageStrById("暴伤"),
[10329] = GetLanguageStrById("永动"),
[10330] = GetLanguageStrById("控怒"),
[10331] = GetLanguageStrById("灼烧宝藏"),
[10332] = GetLanguageStrById("暴伤宝藏"),
[10333] = GetLanguageStrById("永动宝藏"),
[10334] = GetLanguageStrById("控怒宝藏"),
[10335] = GetLanguageStrById(""),
[10336] = GetLanguageStrById("、周"),
[10337] = GetLanguageStrById(""),

View File

@ -112,6 +112,7 @@ end
function PoolManager:LoadAsset(resName, assetType)
if resName=="" or resName==nil then
Log("resName is nil! error:"..resName)
return nil
end
local tempTable = self.mPoolTable[resName]
@ -134,7 +135,7 @@ function PoolManager:LoadAsset(resName, assetType)
else
local _obj = resMgr:LoadAsset(resName)
if _obj == nil then
Log("resource is nil! error:"..resName)
Log("resource is nil! error:"..resName.."!")
resMgr:UnLoadAsset(resName)
return nil
end

View File

@ -7,22 +7,22 @@ local orginLayer = 0
local activityType = {
[1] = {
bg = "Dragon-Ball七龙珠--(450)",
bg = "Dragon-Ball--(450)",
name = Language[10331],
gameObject = "daoxuanbaojing" ,
},
[4] = {
bg = "Dragon-Ball七龙珠--(338)",
bg = "Dragon-Ball--(338)",
name = Language[10334],
gameObject = "fuochanbaojing" ,
},
[3] = {
bg = "Dragon-Ball七龙珠--(330)",
bg = "Dragon-Ball--(330)",
name = Language[10333],
gameObject = "renjiebaojing" ,
},
[2] = {
bg = "Dragon-Ball七龙珠--(77)",
bg = "Dragon-Ball--(77)",
name = Language[10332],
gameObject = "yaolingbaojing" ,
},