Merge branch 'master_local_test' into master_develop
# Conflicts: # Assets/Effect.meta # Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_bhxz_00013_t1_attack_02.prefab.meta # Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_bhxz_00013_t1_attack_03.prefab.meta # Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ddtz_00049_001_01.prefab.meta # Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset # Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchGuessTipViewPopup.lua.meta # Assets/ManagedResources/~Lua/Modules/MapChoose.metadev_chengFeng
commit
65756cbe59
|
|
@ -1 +1 @@
|
|||
{"subChannel":"1", "buglyId":"261348dcd3", "channel":"pc", "resUrl":"http://60.1.1.12/jieling_dl/dev/assetBundles/subChannal094-test/", "packageVersion":"0.2", "version":"0.15.0", "serverUrl":"http://60.1.1.23:8080/"}
|
||||
{"buglyId":"261348dcd3", "channel":"pc", "resUrl":"http://60.1.1.12/jieling_dl/dev/assetBundles/subChannal094-test/", "packageVersion":"0.2", "subChannel":"1", "version":"0.15.0", "serverUrl":"http://60.1.1.23:8080/"}
|
||||
|
|
@ -279,7 +279,7 @@ MonoBehaviour:
|
|||
isSDK: 1
|
||||
isSDKLogin: 0
|
||||
isGuide: 1
|
||||
isOpenGM: 0
|
||||
isOpenGM: 1
|
||||
--- !u!4 &57277738265262265
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f8caebb1f24cd114ebc6fd41468c2df2
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/atlas/treasureofheaven
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_bahy_0017_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_bahy_0017_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_byjy_0038_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_byjy_0038_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_ddk_0023_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_ddk_0023_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_dhx_0022_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_dhx_0022_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_djx_0048_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_djx_0048_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_djy_0013_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_djy_0013_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_ds_0011_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_ds_0011_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_fc_0032_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_fc_0032_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_fwkl_0010_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_fwkl_0010_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_fwwb_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_fwwb_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_gc_0025_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_gc_0025_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_gmyl_0030_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_gmyl_0030_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_hjyl_0043_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_hjyl_0043_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_hwws_0008_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_hwws_0008_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_hydyg_0001_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_hydyg_0001_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_hyjl_0002_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_hyjl_0002_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_hypd_0003_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_hypd_0003_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_jdjs_0009_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_jdjs_0009_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_jjdl_0044_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_jjdl_0044_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_jy_0004_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_jy_0004_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_jyw_0005_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_jyw_0005_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_kl_0007_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_kl_0007_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_kn_0018_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_kn_0018_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_lrh_0027_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_lrh_0027_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_mg_0047_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_mg_0047_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_mh_0046__attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_mh_0046__attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_mmls_0045_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_mmls_0045_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_my_0037_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_my_0037_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_mz_0020_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_mz_0020_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_rtz_0012_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_rtz_0012_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_sg_0024_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_sg_0024_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_sm_0021_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_sm_0021_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_syjm_0026_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_syjm_0026_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_wy_0019_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_wy_0019_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_xdd_0015_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_xdd_0015_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_xyysz_0014_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_xyysz_0014_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_ymmj_0040_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_ymmj_0040_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_m_ys_0028_attack_01
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_ys_0028_attack_01
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_c_xy_0012_skeff_tapsk_healeff
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_c_yr_0007_skeff_slidesk_screeneff
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_c_ywg_0045_skeff_slidesk_attacked
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/audio/skill/skill/audio_c_ywy_0040_skeff_slidesk_screeneff
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -84,5 +84,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/bg/r_hero_bg_dao
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -84,5 +84,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/bg/r_hero_bg_fo
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -84,5 +84,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/bg/r_hero_bg_ren
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -84,5 +84,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/bg/r_hero_bg_yao
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -127,5 +127,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: lz4/dynamicatlas/m_chsm_0035_png
|
||||
assetBundleVariant: unity3d
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 7a18bf804ae55af498bd3019e9981f46
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lzma/luabytes
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: eb36301355f553b4581d08cdd258ffa7
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -1284,7 +1284,7 @@ end
|
|||
---- type, -- required, 调用时机
|
||||
---- }
|
||||
function SubmitExtraData(context)
|
||||
if not AppConst.isSDK then
|
||||
if not AppConst.isSDKLogin then
|
||||
return
|
||||
end
|
||||
local params = SDK.SDKSubmitExtraDataArgs.New()
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ function this.LoginRequest(openId, func)
|
|||
data.ip_s = AppConst.isSDK and AndroidDeviceInfo.Instance:GetLocalIpAddress() or ""
|
||||
data.distinct_id = AppConst.isSDK and openId or ""
|
||||
data.openId = openId
|
||||
data.channel_s = AppConst.isSDK and AppConst.SdkChannel .. "#" .. AppConst.SdkPackageName or "" --pt_pid.."#"..pt_gid
|
||||
data.channel_s = AppConst.isSDKLogin and AppConst.SdkChannel .. "#" .. AppConst.SdkPackageName or "" --pt_pid.."#"..pt_gid
|
||||
data.platform_s = AppConst.isSDK and "ADR" or "PC"
|
||||
|
||||
local msg = data:SerializeToString()
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ PluginImporter:
|
|||
- first:
|
||||
Android: Android
|
||||
second:
|
||||
enabled: 0
|
||||
enabled: 1
|
||||
settings: {}
|
||||
- first:
|
||||
Any:
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ PluginImporter:
|
|||
- first:
|
||||
Android: Android
|
||||
second:
|
||||
enabled: 0
|
||||
enabled: 1
|
||||
settings: {}
|
||||
- first:
|
||||
Any:
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ PluginImporter:
|
|||
- first:
|
||||
Android: Android
|
||||
second:
|
||||
enabled: 1
|
||||
enabled: 0
|
||||
settings: {}
|
||||
- first:
|
||||
Any:
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ PluginImporter:
|
|||
- first:
|
||||
Android: Android
|
||||
second:
|
||||
enabled: 1
|
||||
enabled: 0
|
||||
settings: {}
|
||||
- first:
|
||||
Any:
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{"subChannel":"1", "buglyId":"261348dcd3", "channel":"pc", "resUrl":"http://60.1.1.12/jieling_dl/dev/assetBundles/subChannal094-test/", "packageVersion":"0.2", "version":"0.15.0", "serverUrl":"http://60.1.1.23:8080/"}
|
||||
{"buglyId":"261348dcd3", "channel":"pc", "resUrl":"http://60.1.1.12/jieling_dl/dev/assetBundles/subChannal094-test/", "packageVersion":"0.3", "subChannel":"1", "version":"0.16.1", "serverUrl":"http://60.1.1.23:8080/"}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue