wangzhenxing
|
3d9bf0041f
|
[战斗]============灵兽技能伤害不检测是否命中
|
2021-10-21 13:25:41 +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
|
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 |
gaoxin
|
32cabdd75c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-20 13:52:00 +08:00 |
gaoxin
|
74f3c07aa4
|
【山河每日奖励】新增二次确认
|
2021-10-20 13:51:55 +08:00 |
ZhangBiao
|
f75e42d9c9
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
|
2021-10-20 13:41:32 +08:00 |
ZhangBiao
|
7bd64b6a13
|
Merge branch 'china/dev' into 0功能/主角修为
|
2021-10-20 13:16:07 +08:00 |
ZhangBiao
|
76cfad3419
|
【主角修为】完成提交
|
2021-10-20 13:15:31 +08:00 |
jiaoyangna
|
7d1f1d7f01
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-20 11:17:27 +08:00 |
xuexinpeng
|
0eaaf0fc77
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-19 19:07:25 +08:00 |
xuexinpeng
|
c1483a7438
|
玉虚论道 战斗记录添加空判断
|
2021-10-19 19:06:12 +08:00 |
gaoxin
|
e6af50143c
|
【山河社稷图】修复小人方向错误
|
2021-10-19 19:03:02 +08:00 |
ZhangBiao
|
a387432369
|
【主角修为】提交
|
2021-10-19 18:34:10 +08:00 |
gaoxin
|
7a9cdc15b2
|
Merge branch '0功能/山河社稷图每日奖励' into china/dev
|
2021-10-19 18:02:20 +08:00 |
gaoxin
|
e01b39c8a4
|
【山河每日奖励】优化宝箱显示
|
2021-10-19 18:01:50 +08:00 |
gaoxin
|
3c371623d7
|
【山河每日奖励】完善奖励领取逻辑
|
2021-10-19 17:07:32 +08:00 |
ZhangBiao
|
8f05e215fe
|
【我要变强】增加评分进度条显隐控制
|
2021-10-19 15:40:42 +08:00 |
ZhangBiao
|
2d982e67d3
|
【主角修为】提交
|
2021-10-19 15:34:43 +08:00 |
gaoxin
|
335bc04645
|
【每日豪礼】选中时也显示红点
|
2021-10-19 13:52:58 +08:00 |
jiaoyangna
|
2ec0a28cf3
|
去掉log
|
2021-10-19 13:34:03 +08:00 |
jiaoyangna
|
47a5fe6e3f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-19 13:25:21 +08:00 |
jiaoyangna
|
005468635f
|
页签添加红点
|
2021-10-19 13:25:08 +08:00 |
ZhangBiao
|
2f92759e9f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-19 11:20:22 +08:00 |
ZhangBiao
|
db87d4925a
|
【灵兽山】放生10只整灵兽后,可以同时选择整只灵兽和碎片,恭送后消耗是正确的,仅显示问题
|
2021-10-19 11:20:11 +08:00 |
gaoxin
|
89d93783b7
|
【优化】每日豪礼充值以后没有红点提示领取
|
2021-10-19 11:08:35 +08:00 |