Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2022-01-06 16:47:35 +08:00
commit 3f6f975310
1 changed files with 152 additions and 1 deletions

View File

@ -1063,6 +1063,7 @@ MonoBehaviour:
- Assets/ManagedResources/~Lua/Modules/Expedition
- Assets/ManagedResources/~Lua/Modules/Expedition/View
- Assets/ManagedResources/~Lua/Modules/Expert
- Assets/ManagedResources/~Lua/Modules/Explore
- Assets/ManagedResources/~Lua/Modules/FifteenDayGift
- Assets/ManagedResources/~Lua/Modules/Fight
- Assets/ManagedResources/~Lua/Modules/Fight/View
@ -16403,6 +16404,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 30
resAbNameIndex: 15
- resName: r_yunmenghaoli_rukou
extension: .png
resPathIndex: 30
resAbNameIndex: 15
- resName: s_sanjiechumo_ren_1
extension: .png
resPathIndex: 31
@ -17047,6 +17052,114 @@ MonoBehaviour:
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: tansuo_01
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: tansuo_02
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: tansuo_03
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: tansuo_04
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: tansuo_05
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: tansuo_06
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: tansuo_07
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: tansuo_08
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: t_tansuo_andi
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: t_tansuo_anniu
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: t_tansuo_chankanshouyi
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: t_tansuo_jindutubiao
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: t_tansuo_sousuorukuo
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: t_tansuo_sousuozhong1
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: t_tansuo_sousuozhong2
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: t_tansuo_sousuozhong3
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: t_tansuo_tansuotubiao
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: t_tansuo_xialaikuangdi
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: t_tansuo_xialaluan
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: t_tansuo_xiangqingtubiao
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: t_tansuo_xiaobiao
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: t_tansuo_yijiantansuo
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: t_tansuo_yuandi
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: t_tansuo_zhan
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: y_yuxulundao_disidui
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: y_yuxulundao_diwudui
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: y_yuxulundao_tansuozhong
extension: .png
resPathIndex: 57
resAbNameIndex: 28
- resName: l_lingshoubaize_daojukuang
extension: .png
resPathIndex: 58
@ -24947,6 +25060,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 155
resAbNameIndex: 77
- resName: r_zjm_fushengmen
extension: .png
resPathIndex: 155
resAbNameIndex: 77
- resName: r_zjm_haogandu
extension: .png
resPathIndex: 155
@ -24975,6 +25092,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 155
resAbNameIndex: 77
- resName: r_zjm_tansuo
extension: .png
resPathIndex: 155
resAbNameIndex: 77
- resName: r_zjm_yuxulundao
extension: .png
resPathIndex: 155
@ -26355,6 +26476,10 @@ MonoBehaviour:
extension: .png
resPathIndex: 160
resAbNameIndex: 78
- resName: r_tongyong_xinglijuling
extension: .png
resPathIndex: 160
resAbNameIndex: 78
- resName: t_tapolingxiao_dixiazhezhaobai
extension: .png
resPathIndex: 161
@ -58947,6 +59072,18 @@ MonoBehaviour:
extension: .prefab
resPathIndex: 681
resAbNameIndex: 3130
- resName: ExploreMainPanel
extension: .prefab
resPathIndex: 681
resAbNameIndex: 3130
- resName: ExplorePanel
extension: .prefab
resPathIndex: 681
resAbNameIndex: 3130
- resName: ExploreRewardPopup
extension: .prefab
resPathIndex: 681
resAbNameIndex: 3130
- resName: card
extension: .prefab
resPathIndex: 682
@ -59351,6 +59488,10 @@ MonoBehaviour:
extension: .prefab
resPathIndex: 711
resAbNameIndex: 3158
- resName: GeneralSizeFitterPopup
extension: .prefab
resPathIndex: 711
resAbNameIndex: 3158
- resName: GeneralTreasurePanel
extension: .prefab
resPathIndex: 711
@ -78035,6 +78176,7 @@ MonoBehaviour:
- lz4/dynamicatlas/artfont/r_zjm_xin_zh.unity3d
- lz4/dynamicatlas/c_chengzhang_bann.unity3d
- lz4/dynamicatlas/commonatlas/artfont/l_mrlb_200_zh.unity3d
- lz4/dynamicatlas/commonatlas/artfont/r_guaji_tansuotongjizi_zh.unity3d
- lz4/dynamicatlas/commonatlas/artfont/x_xianyuan_paibian_zh.unity3d
- lz4/dynamicatlas/commonatlas/r_hero_suodi_suo.unity3d
- lz4/dynamicatlas/commonatlas/r_map_zuobiaodihei.unity3d
@ -79037,6 +79179,7 @@ MonoBehaviour:
- assetBundleName: lz4/prefabs/ui/generalpanel.unity3d
dependences:
- lz4/atlas/commonatlas.unity3d
- lz4/atlas/guildatlas.unity3d
- lz4/atlas/jumpserver.unity3d
- lz4/atlas/mapatlas.unity3d
- lz4/atlas/popupatlas.unity3d
@ -79049,9 +79192,16 @@ MonoBehaviour:
- lz4/bg/r_guanka_richang_tanchuangdi_xiao.unity3d
- lz4/dynamicatlas/bd_tanchuang-kuang01.unity3d
- lz4/dynamicatlas/commonatlas/artfont/s_slbz_yilingqu_zh.unity3d
- lz4/dynamicatlas/commonatlas/bd_xinkapaifan1.unity3d
- lz4/dynamicatlas/commonatlas/bd_xinkapaifan2.unity3d
- lz4/dynamicatlas/commonatlas/bd_xinkapaifan3.unity3d
- lz4/dynamicatlas/commonatlas/bd_xinkapaifan4.unity3d
- lz4/dynamicatlas/commonatlas/bd_xinkapaifan5.unity3d
- lz4/dynamicatlas/commonatlas/bd_xinkapaifan6.unity3d
- lz4/dynamicatlas/commonatlas/d_dhxx_tiao_01.unity3d
- lz4/dynamicatlas/commonatlas/r_guanka_guankajiangliyaojin.unity3d
- lz4/dynamicatlas/commonatlas/r_hero_jinjie-touxiang2.unity3d
- lz4/dynamicatlas/commonatlas/r_jyxz_qizhi_gou.unity3d
- lz4/dynamicatlas/commonatlas/s_slbz_1anniuhuangse.unity3d
- lz4/dynamicatlas/commonatlas/s_slbz_1anniuhuise.unity3d
- lz4/dynamicatlas/commonatlas/s_slbz_1anniuongse.unity3d
@ -79079,6 +79229,7 @@ MonoBehaviour:
- lz4/dynamicatlas/t_tequan_kuang.unity3d
- lz4/fonts/fzjinls.unity3d
- lz4/fonts/kaiu.unity3d
- lz4/fonts/powernewfont.unity3d
- lz4/icon/hero.unity3d
- lz4/icon/item.unity3d
- lz4/icons.unity3d
@ -79465,7 +79616,6 @@ MonoBehaviour:
- assetBundleName: lz4/prefabs/ui/main.unity3d
dependences:
- lz4/atlas/commonatlas.unity3d
- lz4/atlas/fightatlas.unity3d
- lz4/atlas/jumpserver.unity3d
- lz4/atlas/mainatlas.unity3d
- lz4/atlas/popupatlas.unity3d
@ -80077,6 +80227,7 @@ MonoBehaviour:
- assetBundleName: lz4/prefabs/ui/popup.unity3d
dependences:
- lz4/atlas/battleatlas.unity3d
- lz4/atlas/carbonatlas.unity3d
- lz4/atlas/dynamicactivityatlas.unity3d
- lz4/atlas/fightlevelatlas.unity3d
- lz4/atlas/fourelement.unity3d