Commit Graph

11193 Commits (ae3a2fa3e4fc02d702b8642aa7b5a6aee414cf86)
 

Author SHA1 Message Date
luyao 6867a738d8 【气冲斗牛】技能名字音效,去除音频前段留白 2021-12-06 17:02:20 +08:00
ZhangBiao bb4c744ff2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 16:59:20 +08:00
ZhangBiao 78e8865e95 【连购礼包】提交 2021-12-06 16:59:10 +08:00
ZhangBiao daa1780104 【命格】提交 2021-12-06 16:54:16 +08:00
luyao 44ba0b73b4 【音效】meta提交 2021-12-06 16:49:31 +08:00
luyao d88718f6e6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 16:47:20 +08:00
luyao 91b80ebbf6 【牛魔王皮肤】技能名称音效 2021-12-06 16:46:42 +08:00
ZhangBiao 2c1300cb2d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 16:39:02 +08:00
ZhangBiao 19294fab2d 【连购好礼】购买限购礼包,次数不减,显示问题 2021-12-06 16:38:51 +08:00
jiaoyangna c83f294a67 跳转修改提交 2021-12-06 16:31:30 +08:00
jiaoyangna 306e52d2d3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 16:24:26 +08:00
jiaoyangna 6036916582 身外化身添加跳转 2021-12-06 16:22:13 +08:00
wangzhenxing 06948fe7fd [战斗]======人系普攻特效修改 2021-12-06 16:18:50 +08:00
ZhangBiao 0d11371d87 【资源冲突】资源名修改提交 2021-12-06 16:15:24 +08:00
ZhangBiao 52b988524e 【命格】资源提交 2021-12-06 16:07:57 +08:00
jiaoyangna 8b074afa67 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 16:04:31 +08:00
jiaoyangna 9ae56712c4 添加已获得标志 2021-12-06 16:04:01 +08:00
ZhangBiao bf520c66f2 Merge branch 'china/dev' into 0功能/命格 2021-12-06 16:02:27 +08:00
wangzhenxing 44643920ae 【战斗】======被动395 400修改 2021-12-06 16:00:50 +08:00
jiaoyangna df51b91fb0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 15:54:18 +08:00
jiaoyangna da9b75ee80 商店添加 2021-12-06 15:53:01 +08:00
luyao 1199b225cd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 15:46:42 +08:00
jiaoyangna a0440fa3ae 变身卡自选箱修改 2021-12-06 15:45:11 +08:00
luyao 83044f0586 Merge branch 'china/dev' into china/dev_res 2021-12-06 15:43:40 +08:00
jiaoyangna 2a3a22a997 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 15:43:24 +08:00
jiaoyangna 709f125845 商店修改 2021-12-06 15:43:05 +08:00
ZhangBiao 50d2066481 【零售特惠】跳转错误修改 2021-12-06 15:37:53 +08:00
ZhangBiao 022a3ee307 【命格】提交 2021-12-06 15:31:29 +08:00
ZhangBiao b88b0d9dce Merge branch 'china/dev' into 0功能/命格 2021-12-06 15:07:58 +08:00
ZhangBiao 10ad308033 【命格】提交 2021-12-06 15:07:34 +08:00
luyao 45cf7e0ea6 牛魔王【气冲斗牛】技能字 2021-12-06 15:02:42 +08:00
jiaoyangna c78b9d4e27 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 14:51:31 +08:00
jiaoyangna fefd3a7fd5 变身卡修改提交 2021-12-06 14:51:13 +08:00
ZhangBiao 9aef11c828 Merge branch 'china/dev' into 0功能/命格 2021-12-06 14:41:44 +08:00
wangzhenxing 292df63308 【战斗】=======被动 187 276修改 2021-12-06 14:34:23 +08:00
ZhangBiao c8f664b93d Merge branch 'china/dev' into 0功能/命格 2021-12-06 14:24:56 +08:00
ZhangBiao 23be95a314 【命格】提交 2021-12-06 14:24:24 +08:00
ZhangBiao 06d532a9bc 【命格】开坑 2021-12-06 14:06:23 +08:00
jiaoyangna 88c10d8031 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-06 14:06:01 +08:00
jiaoyangna ab722baa35 变身卡修改提交 2021-12-06 14:05:43 +08:00
JLIOSM1 2714a8c8f6 【AB加密】修复游戏内无法加载files文件的问题,优化splashpanel的判断方式 2021-12-06 13:44:49 +08:00
JLIOSM1 28dbfe57eb 【打包工具】添加IOS打包工工具的部分功能 2021-12-06 13:44:44 +08:00
JLIOSM1 f46357527d [IOS]xipu包接口适应 2021-12-06 13:44:38 +08:00
zhangshanxue 6b506a2482 【AB加密】路径错误 2021-12-06 13:44:33 +08:00
zhangshanxue cfeedca679 【AB加密】Android不再进行加密 2021-12-06 13:44:26 +08:00
zhangshanxue 2d73b2d13a encrypt 2021-12-06 13:44:21 +08:00
gaoxin 6a817f1b01 【AB加密】加密工具代码提交 2021-12-06 13:44:14 +08:00
gaoxin b6c01c82cf 【热更工具】cdn上没有时上传全部 2021-12-06 13:44:09 +08:00
gaoxin a3093c2d3e 【打包工具】选中时再显示按钮 2021-12-06 13:44:03 +08:00
gaoxin d154dc9248 【AB加密】解密方法提交 2021-12-06 13:43:57 +08:00