shihongyi
|
2d63f71ff5
|
分支合并手动解决冲突,待测
|
2020-08-12 14:13:50 +08:00 |
shihongyi
|
e797e9f48d
|
合并develop &2 进程中,暂时不要更新
|
2020-08-12 11:37:26 +08:00 |
shihongyi
|
4c81a5110e
|
进阶升星属性
|
2020-08-12 10:56:41 +08:00 |
altair
|
c269e053d5
|
修改宝魂图标
|
2020-08-12 10:46:54 +08:00 |
altair
|
254181112d
|
修改道具图标
|
2020-08-12 10:27:04 +08:00 |
zhangqiang
|
b67b99ad93
|
无尽副本临时新增入口
|
2020-08-11 16:31:17 +08:00 |
skuld
|
916a6f7e25
|
合并置换玉消耗的ID的配置
|
2020-08-10 15:11:26 +08:00 |
skuld
|
7aac974925
|
添加新玩法帮助文字
|
2020-08-10 15:03:37 +08:00 |
shihongyi
|
686c7c468f
|
修改阵营属性权限、戒灵宝藏价格198
|
2020-08-10 14:25:56 +08:00 |
skuld
|
107096bd96
|
添加置换玉消耗
|
2020-08-10 11:20:13 +08:00 |
zhangqiang
|
15722ee892
|
Merge branch '0功能/法宝归元和神将置换' into master_develop2
|
2020-08-10 11:01:46 +08:00 |
skuld
|
1ee836e1eb
|
置换玉道具ID
|
2020-08-10 10:41:57 +08:00 |
altair
|
f9d334ed29
|
修改角色背景
|
2020-08-10 10:12:49 +08:00 |
zhangqiang
|
32c788b8ac
|
神将合成代码
|
2020-08-08 18:18:26 +08:00 |
zhangqiang
|
17b6db91e2
|
英雄合成提交部分代码
|
2020-08-08 15:51:55 +08:00 |
liujiaqi
|
996a4168e2
|
绿篮紫色宝物自选箱不进版本绿蓝宝物随机描述修改纵排技能攻击目标修改
|
2020-08-07 17:58:12 +08:00 |
shihongyi
|
dfc2f80069
|
无效自选箱不进版本
|
2020-08-07 17:48:19 +08:00 |
gongjiawei
|
fe738c1dea
|
音频更新
|
2020-08-07 17:33:40 +08:00 |
liujiaqi
|
ca54d29c40
|
1132追击目标更正,神女魂印名称修正狂噬戮兽描述修正
|
2020-08-07 17:12:25 +08:00 |
liujiaqi
|
85433824da
|
狂噬戮兽魂印描述修正,神女魂印修正为妈祖魂印,1132技能追击目标修正
|
2020-08-07 16:40:02 +08:00 |
liujiaqi
|
800821f011
|
1132追击目标变更
|
2020-08-07 14:45:19 +08:00 |
liujiaqi
|
487e321192
|
付费活动开启
|
2020-08-07 11:04:34 +08:00 |
shihongyi
|
428ee21777
|
炸弹 回春 进背包
|
2020-08-06 18:24:21 +08:00 |
shihongyi
|
8dbd031fa7
|
无效属性置0
|
2020-08-06 18:20:32 +08:00 |
shihongyi
|
a4f9309f37
|
星级等级上限
|
2020-08-06 18:17:51 +08:00 |
liujiaqi
|
ccee02a26a
|
开服狂欢三日登陆奖励更改为唤元神符
|
2020-08-06 18:03:02 +08:00 |
gongjiawei
|
8a5d729f71
|
音频更新
|
2020-08-06 16:12: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 |
shihongyi
|
89510e36f1
|
巅峰赛引导误填bug
|
2020-08-05 17:55:15 +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 |
shihongyi
|
1502f8ec1b
|
转盘金币产出下调
|
2020-08-05 15:32:04 +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 |
shihongyi
|
1e55175acb
|
限时抽活动时间
|
2020-08-05 10:59:36 +08:00 |
liujiaqi
|
6fb9b33978
|
新增挂机地图
|
2020-08-04 18:22:11 +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 |
liujiaqi
|
cf8c32c645
|
我要变强点将神符换元神符描述修改,妈祖庇佑改为神女庇佑魂印
|
2020-08-04 16:25:52 +08:00 |
gongjiawei
|
15494b2117
|
音频更新
|
2020-08-04 14:33:15 +08:00 |
kansa
|
c0730e64a3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 14:12:44 +08:00 |
kansa
|
8b47a37eb3
|
推迟森罗幻境刷新时间
|
2020-08-04 14:12:12 +08:00 |
liujiaqi
|
b4cdaaafe4
|
累冲448档碎片奖励修正签到碎片奖励修正
|
2020-08-04 14:12:09 +08:00 |
shihongyi
|
28e158032e
|
统一 5星碎片只商店
|
2020-08-04 11:58:16 +08:00 |