Commit Graph

6388 Commits (3d9bf0041f1718da4805ca703ff445e4af61d7c3)

Author SHA1 Message Date
jiaoyangna 1f077cbcdc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-19 11:04:25 +08:00
jiaoyangna c091c55bef 【ID1010437】
【优化】开服玉帝御剑坐骑活动
2021-10-19 11:04:06 +08:00
gaoxin a23791e07c 【战斗】失败界面添加我要变强跳转 2021-10-19 10:46:12 +08:00
ZhangBiao 48236ba797 【天枢密卷】增加跳转 2021-10-19 10:34:45 +08:00
wangzhenxing 54b07410bf Merge branch 'china/dev' into 0功能/玉虚论道 2021-10-19 10:12:38 +08:00
wangzhenxing b5f27a64af 主角技能提交 2021-10-19 10:00:34 +08:00
ZhangBiao 47791f3711 【连点】车迟斗法,十绝阵一类的玩法,快速点击进入战斗,会直接扣两个次数(尝试修复) 2021-10-19 09:38:05 +08:00
ZhangBiao f10cd9dc35 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-19 09:33:51 +08:00
ZhangBiao a9e430c755 【七界试炼】【优化】七界试炼优化上下层提示 2021-10-19 09:33:37 +08:00
gaoxin 11d5f735c7 【七界试炼】排行榜删除切磋和加入黑名单按钮 2021-10-18 21:06:01 +08:00
jiaoyangna d3ca843ae5 罗浮争锋去掉log 2021-10-18 18:26:32 +08:00
jiaoyangna fca015215c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-18 18:23:19 +08:00
jiaoyangna f2e06a8bc4 罗浮争锋小人朝向错误修改 2021-10-18 18:23:06 +08:00
gaoxin 47d6de27ff 【山河社稷图】添加每日奖励按钮及领取逻辑添加 2021-10-18 18:06:47 +08:00
ZhangBiao cb3803a413 Merge branch 'china/dev' into 0活动开发聚集地/御剑行 2021-10-18 16:30:27 +08:00
gaoxin 3a559c912c 【挚礼月卡】月卡功能数据剥离到MonthCardManager 2021-10-18 16:22:11 +08:00
ZhangBiao bc7e316531 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-18 16:19:19 +08:00
ZhangBiao 1c137cc911 【寻宝迷踪】骑着坐骑寻宝,特效显示分割线,需要修改 2021-10-18 16:18:59 +08:00
jiaoyangna 022a7f46c6 天书秘卷没有秘卷时滑动修改提交 2021-10-18 11:53:09 +08:00
ZhangBiao 3d0e6a4be4 Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-10-18 11:35:58 +08:00
ZhangBiao 034d727a6f 【御剑行】提交 2021-10-18 11:32:06 +08:00
ZhangBiao 8f03ae0485 【御剑行】提交 2021-10-18 10:56:14 +08:00
wangzhenxing 35c1987c26 Merge branch '0功能/玉虚论道' into china/dev 2021-10-18 09:59:26 +08:00
wangzhenxing c23a1e9bd0 赛季重置修改 2021-10-18 09:56:38 +08:00
wangzhenxing 23438def99 对战信息界面添加动效 2021-10-16 19:31:03 +08:00
wangzhenxing 23ed8a7a2b 【战斗】==========被动344添加空判断 2021-10-16 18:12:56 +08:00
wangzhenxing 267598d53b Revert "【战斗】=======被动199"
This reverts commit c8603f010f.
2021-10-16 18:07:30 +08:00
jiaoyangna c1cf0e4a79 牛气冲天进度显示修改 2021-10-16 17:59:38 +08:00
ZhangBiao 56067b59af Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-16 17:52:59 +08:00
ZhangBiao 381551df78 牛气冲天 神将升星添加进度 2021-10-16 17:52:50 +08:00
jiaoyangna d0c9f01122 去掉log 2021-10-16 17:48:07 +08:00
wangzhenxing c8603f010f 【战斗】=======被动199 2021-10-16 16:47:57 +08:00
ZhangBiao 27e433ca6b 【牛气冲天】增加进度 2021-10-16 16:37:44 +08:00
ZhangBiao 617a4f640b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-16 15:38:12 +08:00
ZhangBiao e86a0c04a6 【乾坤宝盒】跳转进入乾坤宝盒界面,查看魂印特效穿透 2021-10-16 15:37:58 +08:00
wangzhenxing 61dddc3c02 段位变化展示修改提交 2021-10-16 15:27:03 +08:00
jiaoyangna 6917dc8e1c 背包神将碎片合成最大数量修改 2021-10-16 15:12:54 +08:00
ZhangBiao 45b9f3f3bb 【御剑行】增加特效 2021-10-16 15:08:29 +08:00
ZhangBiao bd79f13e27 【连点】车迟斗法,十绝阵一类的玩法,快速点击进入战斗,会直接扣两个次数 2021-10-16 13:45:47 +08:00
wangzhenxing c30f236943 阵容拖拽问题 2021-10-15 20:44:11 +08:00
wangzhenxing 20e70dfffb 进度条修改 2021-10-15 20:32:35 +08:00
wangzhenxing 08f87f8623 bug修改 2021-10-15 18:39:46 +08:00
ZhangBiao 550ae985be 【牛气冲天】跳转提交 2021-10-15 17:52:05 +08:00
ZhangBiao d76713abf2 【牛气冲天】更改标签顺序 2021-10-15 17:39:04 +08:00
ZhangBiao 3dca94f9aa 【牛气冲天】提交 2021-10-15 17:14:27 +08:00
ZhangBiao 4ccaca133e 【牛气冲天】修改提交 2021-10-15 16:49:00 +08:00
wangzhenxing d1796fdab6 bug修改 2021-10-15 15:47:55 +08:00
ZhangBiao 08ea8c3be8 【御剑行】提交 2021-10-15 15:09:59 +08:00
ZhangBiao a162e6aa64 【御剑行】 2021-10-15 14:50:59 +08:00
ZhangBiao decf1b869c 【御剑行】提交 2021-10-15 14:47:14 +08:00
jiaoyangna e026881024 ID1010484】
易经宝库可选奖励优化
2021-10-15 14:35:57 +08:00
ZhangBiao e43abf17b2 【御剑行】提交 2021-10-15 14:14:04 +08:00
ZhangBiao a16b8c5e75 Merge branch 'china/dev' into 0活动开发聚集地/御剑行 2021-10-15 14:06:35 +08:00
ZhangBiao cbef4e021b 【御剑行】提交 2021-10-15 14:02:33 +08:00
ZhangBiao 132dc11c6b 【御剑行】提交 2021-10-15 13:33:58 +08:00
jiaoyangna 234c17cfe4 挂机奖励预览四舍五入显示
(cherry picked from commit 09ef1c8981)
2021-10-15 12:13:47 +08:00
jiaoyangna 3e616a0462 排行榜上小人方向修改
(cherry picked from commit f31f62ec09)
2021-10-15 12:13:28 +08:00
jiaoyangna 83ceaa43b7 排行榜上小人朝侧面修改提交
(cherry picked from commit 851bd2450c)
2021-10-15 12:13:14 +08:00
jiaoyangna 09ef1c8981 挂机奖励预览四舍五入显示 2021-10-15 12:12:38 +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
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 101f406a4c 【ID1010469】
好感度优化
2021-10-14 20:15:53 +08:00
ZhangBiao 2fda9c77ff 【御剑行】提交 2021-10-14 19:57:40 +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
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 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
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 ac0221b89f 白金装备修改提交 2021-10-14 15:05:36 +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 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
yuanshuai dd56c24ae8 点金前端显示bug修改 2021-10-13 16:02:23 +08:00
wangzhenxing ee434c85cc 结算界面名字显示修改 2021-10-13 15:45:42 +08:00
ZhangBiao 6870073129 【御剑行】排行完成 2021-10-13 15:39:47 +08:00
wangzhenxing 5b41289cd0 玉虚论道阵容界面修改 2021-10-13 15:26:12 +08:00