ZhangBiao
|
96860e358c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-21 17:46:34 +08:00 |
ZhangBiao
|
42618596e1
|
【七界试炼】按钮显隐提交
|
2021-10-21 17:46:23 +08:00 |
jiaoyangna
|
36b574a645
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-21 17:39:09 +08:00 |
jiaoyangna
|
8fa8a9d690
|
至尊降世界面修改提交
|
2021-10-21 17:38:53 +08:00 |
ZhangBiao
|
a6ebd138e4
|
【新百宝商会】提交
|
2021-10-21 17:28:53 +08:00 |
gaoxin
|
6cb068ea60
|
【建木神树】红点刷新不及时
|
2021-10-21 17:18:40 +08:00 |
gaoxin
|
34a58a310c
|
【排行榜】修复膜拜后页签红点刷新不及时,修复跨服前七天跨服按钮会显示红点
|
2021-10-21 17:02:05 +08:00 |
gaoxin
|
f4912f5772
|
【逍遥游】转盘再加速
|
2021-10-21 16:43:19 +08:00 |
gaoxin
|
aa9ce7f992
|
【逍遥游】优化转盘速度
|
2021-10-21 16:30:38 +08:00 |
wangzhenxing
|
5575ba2245
|
[战斗]=====灵兽技能修改提交
|
2021-10-21 16:17:10 +08:00 |
wangzhenxing
|
c131aa96b4
|
[qijie]button
|
2021-10-21 16:12:59 +08:00 |
ZhangBiao
|
bf82ae5d9e
|
【七界试炼】按钮调整2
(cherry picked from commit da71c81536 )
|
2021-10-21 15:16:28 +08:00 |
ZhangBiao
|
da71c81536
|
【七界试炼】按钮调整2
|
2021-10-21 15:15:55 +08:00 |
ZhangBiao
|
24f0574e0a
|
【七界试炼】按钮修改
(cherry picked from commit 81fe590710 )
|
2021-10-21 15:15:24 +08:00 |
ZhangBiao
|
81fe590710
|
【七界试炼】按钮修改
|
2021-10-21 15:12:01 +08:00 |
gaoxin
|
7822274c0c
|
【出包场景】新增游心的第二个包的出包场景
|
2021-10-21 13:48:43 +08:00 |
wangzhenxing
|
3d9bf0041f
|
[战斗]============灵兽技能伤害不检测是否命中
|
2021-10-21 13:25:41 +08:00 |
ZhangBiao
|
448ec131e8
|
Merge branch 'china/dev' into 0活动开发聚集地/百宝商会第二季
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-10-21 13:07:13 +08:00 |
ZhangBiao
|
3293656507
|
【新百宝商会】提交
|
2021-10-21 13:06:25 +08:00 |
wangzhenxing
|
bb849d4b93
|
主角技能界面修改
|
2021-10-21 11:58:33 +08:00 |
ZhangBiao
|
b5d4d87f63
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-21 11:14:36 +08:00 |
ZhangBiao
|
984bb12611
|
【主角修为】问号文字调整
|
2021-10-21 11:14:24 +08:00 |
gaoxin
|
04613652fd
|
【公会战】不再请求公会战数据
|
2021-10-21 11:10:55 +08:00 |
ZhangBiao
|
afaf672de4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-21 10:58:21 +08:00 |
ZhangBiao
|
205200268d
|
【主角修为】提交
|
2021-10-21 10:58:09 +08:00 |
wangzhenxing
|
18da581061
|
[战斗]=====技能添加空判断
|
2021-10-21 10:41:57 +08:00 |
gaoxin
|
da665cc148
|
【编队】取消公会战相关编队判断,获取编队信息时不再检测公会战防守编队信息
|
2021-10-21 10:22:00 +08:00 |
wangzhenxing
|
a17242b0c0
|
Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab
Assets/ManagedResources/~Lua/Data/ConfigData.lua
Assets/ManagedResources/~Lua/Data/UIData.lua
Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua
|
2021-10-20 22:13:29 +08:00 |
wangzhenxing
|
7b7879ce89
|
[战斗]=========效果130修改
|
2021-10-20 22:00:01 +08:00 |
wangzhenxing
|
24f0812b9f
|
主角技能提交
|
2021-10-20 21:33:37 +08:00 |
gaoxin
|
630271bf6c
|
【挚礼月卡】修复金额刷新不及时的问题
|
2021-10-20 19:15:40 +08:00 |
jiaoyangna
|
ce28ba9362
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-20 18:50:47 +08:00 |
jiaoyangna
|
5425fc980a
|
坐骑界面技能描述修改提交
|
2021-10-20 18:50:34 +08:00 |
ZhangBiao
|
6a3c9ccd25
|
【主角修为】问号提交
|
2021-10-20 18:35:30 +08:00 |
ZhangBiao
|
bb489b08e8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-20 18:33:02 +08:00 |
ZhangBiao
|
1e3b3c9f27
|
【御剑行】修改提交
|
2021-10-20 18:31:59 +08:00 |
gaoxin
|
09ca5f98ad
|
Merge branch '0活动开发聚集地/挚礼月卡' into china/dev
|
2021-10-20 16:36:56 +08:00 |
gaoxin
|
a712ddee3b
|
【挚礼月卡】功能完善
|
2021-10-20 16:36:36 +08:00 |
jiaoyangna
|
e420c89429
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-20 15:17:38 +08:00 |
jiaoyangna
|
f3f416e202
|
添加天书秘卷登陆请求
|
2021-10-20 15:17:22 +08:00 |
gaoxin
|
85b15d6cb7
|
Merge branch 'china/dev' into 0活动开发聚集地/挚礼月卡
|
2021-10-20 15:14:38 +08:00 |
ZhangBiao
|
65c676eda9
|
【主角修为】文字调整
|
2021-10-20 15:11:41 +08:00 |
ZhangBiao
|
4299fdd035
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-20 15:10:09 +08:00 |
ZhangBiao
|
0d8af528ff
|
【主角修为】引导提交
|
2021-10-20 15:09:59 +08:00 |
jiaoyangna
|
dd89fb59e8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-20 15:06:59 +08:00 |
jiaoyangna
|
9aa975cd7b
|
羁绊打印
|
2021-10-20 15:06:23 +08:00 |
ZhangBiao
|
e2cb67caf3
|
【修行】点击加成按钮后 游戏崩溃修改
|
2021-10-20 14:27:43 +08:00 |
ZhangBiao
|
557b9cc523
|
Merge branch 'china/dev' into 0活动开发聚集地/百宝商会第二季
|
2021-10-20 14:05:15 +08:00 |
ZhangBiao
|
52ead2a89e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-20 14:04:52 +08:00 |
ZhangBiao
|
d774b09a63
|
【御剑行】协议和资源提交
|
2021-10-20 14:04:40 +08:00 |