Commit Graph

9971 Commits (9c9beb78dad214ccdcd03e9840bb94e89efadfd6)
 

Author SHA1 Message Date
jiaoyangna 09ef1c8981 挂机奖励预览四舍五入显示 2021-10-15 12:12:38 +08:00
jiaoyangna 35e0b7e419 排行榜上小人方向修改 2021-10-15 11:53:16 +08:00
jiaoyangna f31f62ec09 排行榜上小人方向修改 2021-10-15 11:51:38 +08:00
jiaoyangna 851bd2450c 排行榜上小人朝侧面修改提交 2021-10-15 11:40:01 +08:00
ZhangBiao 35eb36384e 【御剑行】提交 2021-10-15 11:15:42 +08:00
jiaoyangna 450d426232 Merge branch 'china/dev' into 0功能/玉虚论道 2021-10-15 10:05:22 +08:00
jiaoyangna 7ac2417ff8 【ID1010479】
天书秘卷调整
2021-10-15 09:54:12 +08:00
wangzhenxing 474549ea24 bug修改 2021-10-14 21:36:29 +08:00
wangzhenxing 444f8259ee 玉虚论道主界面请求添加类型 2021-10-14 21:30:35 +08:00
jiaoyangna f852ba73ed 长按赠完礼物时多提示一次礼物数量不足 2021-10-14 20:39:37 +08:00
jiaoyangna 8c95ee03e9 【ID1010479】
天书秘卷调整
2021-10-14 20:18:02 +08:00
jiaoyangna 101f406a4c 【ID1010469】
好感度优化
2021-10-14 20:15:53 +08:00
ZhangBiao 2fda9c77ff 【御剑行】提交 2021-10-14 19:57:40 +08:00
lihaiyang 5fbc4458c4 bat Resource Commit:2021/10/14,18:40:50 2021-10-14 18:40:50 +08:00
ZhangBiao 4d911a4ea4 Merge branch 'china/dev' into 0活动开发聚集地/御剑行 2021-10-14 18:28:55 +08:00
ZhangBiao 6ebe5720a6 【御剑行】红点提交 2021-10-14 18:28:27 +08:00
jiaoyangna b886c7024c 坐骑资源提交 2021-10-14 18:15:07 +08:00
ZhangBiao 46d38b01ec 【御剑行】提交 2021-10-14 18:02:30 +08:00
jiaoyangna 3b5772be75 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-14 17:15:53 +08:00
jiaoyangna ae3f783689 神将天赋修改提交 2021-10-14 17:15:20 +08:00
jiaoyangna 9e46ffd910 神将天赋界面修改提交 2021-10-14 17:14:51 +08:00
wangzhenxing fbb1c387c7 【战斗】=======伤害公式 修改 去点 防御0.5的容错 2021-10-14 17:12:01 +08:00
ZhangBiao cd04fc3d37 Merge branch 'china/dev' into 0活动开发聚集地/御剑行 2021-10-14 17:11:12 +08:00
ZhangBiao 4b6079d4e8 【御剑行】提价 2021-10-14 17:10:40 +08:00
jiaoyangna bbd9c9e1c2 坐骑方向调整 2021-10-14 16:37:09 +08:00
wangzhenxing 072c44d495 [bug]======【ID1018713】
【成就】战力目标成就进度超框,需要改为缩写
2021-10-14 16:35:34 +08:00
ZhangBiao 5a4a42594d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-14 16:17:25 +08:00
ZhangBiao b08af858a9 【牛气冲天】提交 2021-10-14 16:16:52 +08:00
ZhangBiao 67026aa355 Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-10-14 16:13:07 +08:00
ZhangBiao 8ad554a64d 【御剑行】提交 2021-10-14 16:10:54 +08:00
wangzhenxing 66c50b6731 添加屏蔽,点挑战后不能再拖动 2021-10-14 15:48:30 +08:00
wangzhenxing 25bce8b8d4 bug修改提交 2021-10-14 15:38:47 +08:00
ZhangBiao 3d1a5ebd4c 【御剑行】提交 2021-10-14 15:30:46 +08:00
jiaoyangna f964d2a10c 添加,缩短魂印名字 2021-10-14 15:16:14 +08:00
jiaoyangna 204aba3fde 缩短魂印名字 2021-10-14 15:14:07 +08:00
jiaoyangna ac0221b89f 白金装备修改提交 2021-10-14 15:05:36 +08:00
jiaoyangna ad9ee953dc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-14 14:13:16 +08:00
jiaoyangna ea342f1916 装备篇资源提交 2021-10-14 14:13:03 +08:00
wangzhenxing f0fcd144f2 [战斗]===========被动添加 354 355 2021-10-14 13:54:07 +08:00
jiaoyangna 842c9b7592 白金装备属性加成添加 2021-10-14 12:39:40 +08:00
jiaoyangna 8b4f447466 坐骑立绘提交 2021-10-14 12:15:20 +08:00
jiaoyangna 3cbffeab4a 【ID1010437】
【优化】开服玉帝御剑坐骑活动
2021-10-14 12:14:26 +08:00
jiaoyangna 4f580146bd 【ID1010465】
增加白金装备图鉴
2021-10-14 12:01:55 +08:00
ZhangBiao 4eb6e1d9ae 【御剑行】提交 2021-10-14 11:25:44 +08:00
ZhangBiao 2101e974ad 【御剑行】增加投注滑动条 2021-10-14 09:53:51 +08:00
ZhangBiao 81166ae892 【牛气冲天】修改,待后端修改数据,待增加新活动类型 2021-10-13 19:43:25 +08:00
wangzhenxing 7dce99c08c 玉虚修改 2021-10-13 19:35:30 +08:00
ZhangBiao bb9533781d 【御剑行】提交 2021-10-13 19:15:39 +08:00
ZhangBiao 414ab1f3d9 【御剑行】提交 2021-10-13 17:38:32 +08:00
ZhangBiao 018c09d69c 【御剑行】竞猜,差一个三级弹窗 2021-10-13 17:30:26 +08:00