Commit Graph

1190 Commits (cca8355c331d98eabd0946926c61623f5cf5e866)
 

Author SHA1 Message Date
zhangqiang cca8355c33 神将合成提交 2020-08-10 11:28:25 +08:00
zhangqiang 15722ee892 Merge branch '0功能/法宝归元和神将置换' into master_develop2 2020-08-10 11:01:46 +08:00
zhangqiang 3937426101 神将合成提交 2020-08-10 10:56:17 +08:00
zhangqiang 7749211534 合成修改 2020-08-08 19:27:10 +08:00
zhangqiang 32c788b8ac 神将合成代码 2020-08-08 18:18:26 +08:00
zhangqiang 17b6db91e2 英雄合成提交部分代码 2020-08-08 15:51:55 +08:00
zhangqiang 6dd95ec834 神将合成部分显示代码 2020-08-08 11:06:01 +08:00
liujiaqi 996a4168e2 绿篮紫色宝物自选箱不进版本绿蓝宝物随机描述修改纵排技能攻击目标修改 2020-08-07 17:58:12 +08:00
liujiaqi ca54d29c40 1132追击目标更正,神女魂印名称修正狂噬戮兽描述修正 2020-08-07 17:12:25 +08:00
liujiaqi 800821f011 1132追击目标变更 2020-08-07 14:45:19 +08:00
zhangqiang f2d743a343 英雄合成预设更新 2020-08-07 14:23:05 +08:00
liujiaqi 487e321192 付费活动开启 2020-08-07 11:04:34 +08:00
ZhangBiao f09a0448bc 2020-08-07 10:34:18 +08:00
zhangqiang 93e1d880c8 英雄合成界面拼接 2020-08-06 18:34:04 +08:00
shihongyi a4f9309f37 星级等级上限 2020-08-06 18:17:51 +08:00
ZhangBiao ed373d1851 Merge branch '0功能/法宝归元和神将置换' of http://60.1.1.230/gaoxin/JL_Client into 0功能/法宝归元和神将置换 2020-08-06 10:43:28 +08:00
ZhangBiao 44497f73bd 神将置换页面制作1 2020-08-06 10:43:11 +08:00
zhangqiang 3bb0906865 法宝归元中文表 2020-08-06 10:38:55 +08:00
shihongyi b617c30639 置换及合成qa 2020-08-06 09:43:22 +08:00
shihongyi 66a51803b8 置换及合成qa 2020-08-05 20:27:17 +08:00
ZhangBiao eeaa1f26f8 2020-08-05 19:18:15 +08:00
zhangqiang 0a37b3cb11 法宝回归协议提交 2020-08-07 12:41:35 +08:00
ZhangBiao a1b9ca69f6 Merge branch '0功能/法宝归元和神将置换' of http://60.1.1.230/gaoxin/JL_Client into 0功能/法宝归元和神将置换 2020-08-05 17:16:30 +08:00
zhangqiang 4533695a3d 法宝归元界面提交 2020-08-07 12:22:10 +08:00
ZhangBiao d72d87d497 2020-08-05 17:16:06 +08:00
ZhangBiao 203514d85f 神将置换入口添加 2020-08-05 16:30:02 +08:00
shihongyi 2f78b8c2e3 阵营抽保底 2020-08-05 15:47:04 +08:00
shihongyi 0caa56d2a9 置换功能 2020-08-05 15:38:20 +08:00
zhangqiang ed53f7e760 Merge branch 'master_develop' into master_develop2
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	data_execl/base_data/BeStronger.xlsx
#	data_execl/base_data/EquipTalismana.xlsx
#	data_execl/base_data/GlobalActivity.xlsx
2020-08-07 06:54:04 +08:00
ZhangBiao ee19d26bd3 神将置换界面创建 2020-08-05 15:36:22 +08:00
ZhangBiao 6f0c40707e 置换界面 2020-08-05 14:10:46 +08:00
shihongyi 1e55175acb 限时抽活动时间 2020-08-05 10:59:36 +08:00
zhangqiang 54148395b4 日常副本判断开启临时添加战力计算 2020-08-07 06:06:55 +08:00
jiaoyangna dd4800f657 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-04 20:49:48 +08:00
jiaoyangna 1b7f35e41f bg update 2020-08-04 20:49:42 +08:00
ZhangBiao 989703a0e4 乾坤宝盒单抽bug修复、四元阵赠送“元神玉” 2020-08-04 20:30:26 +08:00
ZhangBiao 6acaa8549d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-04 20:23:16 +08:00
ZhangBiao ee28c18254 森罗bug修复 2020-08-04 20:22:56 +08:00
jiaoyangna 802286d743 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-04 18:41:22 +08:00
jiaoyangna e9438df1b7 图鉴优化 2020-08-04 18:41:17 +08:00
zhangqiang e45e6c9325 公会技能升级优化 2020-08-04 18:37:30 +08:00
liujiaqi 9fd25a6c98 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-04 18:24:09 +08:00
liujiaqi 6fb9b33978 新增挂机地图 2020-08-04 18:22:11 +08:00
ZhangBiao 7255baef99 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-04 18:19:38 +08:00
ZhangBiao f548b53b46 开引导 在森罗杀进程 重新登陆后 不回到森罗 2020-08-04 18:19:20 +08:00
kansa 2ceb319c5f 新增挂机背景图1 2020-08-04 17:57:39 +08:00
gongjiawei 4c0c01cefe 音频更新 2020-08-04 17:47:38 +08:00
kansa de8f04b9bc 修改十绝阵怪物预览的显示星级 2020-08-04 17:25:24 +08:00
zhangqiang 7b73f4ae77 升星成功界面加天赋解锁显示 2020-08-04 17:24:15 +08:00
liujiaqi 9823834bcf Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-04 16:26:06 +08:00