Commit Graph

1500 Commits (6b0af3d7fb8440ffb55c87f75de37c5ee50479f6)
 

Author SHA1 Message Date
ZhangBiao 54783bef35 森罗快速点击服务器报错问题修复 2020-08-05 21:12:50 +08:00
jiaoyangna c095459166 no message 2020-08-05 21:01:20 +08:00
shihongyi 66a51803b8 置换及合成qa 2020-08-05 20:27:17 +08:00
lihaiyang 7f328f76c9 轩辕宝境排行榜奖励修改 2020-08-05 20:02:25 +08:00
lihaiyang 1ff898b957 轩辕宝境 还需要修改 临时配置上传(需要配置成对应掉落) 2020-08-05 19:52:46 +08:00
lihaiyang fc6ad943f6 轩辕宝境特权配置 2020-08-05 19:52:03 +08:00
lihaiyang 3a05b61085 添加轩辕宝境挑战特权82001物品 2020-08-05 19:48:20 +08:00
lihaiyang fb5829bf8a 轩辕宝境怪物 和怪物组 临时配置上传 2020-08-05 19:47:30 +08:00
lihaiyang 4b30dd9c7c 特权轩辕宝境挑战次数配置 2020-08-05 19:46:13 +08:00
lihaiyang 6411b30ca3 轩辕宝境配置表上传 2020-08-05 19:45:31 +08:00
lihaiyang ed28a60ac1 轩辕宝境·奖励配置 2020-08-05 19:43:50 +08:00
lihaiyang 9f2087e9ea 轩辕开始时间(星期) 2020-08-05 19:42:57 +08:00
ZhangBiao 456ab0aa92 森罗 进图后2.5秒才能开始移动,避免服务器小差 2020-08-05 19:32:36 +08:00
ZhangBiao eeaa1f26f8 2020-08-05 19:18:15 +08:00
zhangqiang 0a37b3cb11 法宝回归协议提交 2020-08-07 12:41:35 +08:00
gongjiawei 6c4dab9fbb 音頻跟新 2020-08-05 18:15:19 +08:00
lihaiyang a6f1259075 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into xuanyuanbaojing 2020-08-05 18:06:28 +08:00
ZhangBiao 3317071a58 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-05 18:02:56 +08:00
ZhangBiao 879331e416 森罗炸弹数量刷新,奖励和generalpanel界面适配 2020-08-05 18:02:47 +08:00
shihongyi 89510e36f1 巅峰赛引导误填bug 2020-08-05 17:55:15 +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
gaoxin 195a48d3fe 副本添加最大战斗力判断 2020-08-05 16:26:45 +08:00
gongjiawei ee6133f289 音频更新 2020-08-05 16:08:07 +08:00
jiaoyangna 7d5efc523e 图鉴修改提交 2020-08-05 16:04:06 +08:00
jiaoyangna 0a26260692 删除红点 2020-08-05 15:49:44 +08:00
shihongyi 2f78b8c2e3 阵营抽保底 2020-08-05 15:47:04 +08:00
jiaoyangna e33550b2a0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-05 15:43:48 +08:00
jiaoyangna 220577bd0d 图鉴修改 2020-08-05 15:43:40 +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
shihongyi 1502f8ec1b 转盘金币产出下调 2020-08-05 15:32:04 +08:00
jiaoyangna c5bced9968 副本修改提交 2020-08-05 15:00:56 +08:00
ZhangBiao 6f0c40707e 置换界面 2020-08-05 14:10:46 +08:00
shihongyi 73f79d1193 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-05 13:57:56 +08:00
gaoxin 519a24eb2c 修复引导合成碎片时点击速度太快导致引导错误的问题 2020-08-05 13:55:03 +08:00
shihongyi ac3f0e8df3 限时抽时间 2020-08-05 13:51:47 +08:00
gongjiawei 0c1250f88c 音频更新 2020-08-05 11:43:13 +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