Commit Graph

9248 Commits (0722edb10767355bd60420fad48c6f2ee7da77a5)

Author SHA1 Message Date
gaoxin e1381636e1 【坐骑】修复展示界面不居中 2021-11-01 17:47:35 +08:00
ZhangBiao 36853599ae Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-01 17:22:10 +08:00
ZhangBiao 87210b9d73 【界面优化】寻宝特权,秘宝试炼、解锁秘宝、四象心法 2021-11-01 17:21:59 +08:00
gaoxin 0ad86bba92 【坐骑】牛哥资源优化 2021-11-01 17:18:32 +08:00
gaoxin 0defc12b5a 【资源】头像卡牌资源优化 2021-11-01 16:46:30 +08:00
gaoxin 47e510c026 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-01 16:43:22 +08:00
liujiaqi 0438e7db6b 【资源】敖丙皮肤 2021-11-08 16:41:39 +08:00
gaoxin c62c0bc549 【坐骑】修复人物变高的问题 2021-11-01 16:42:46 +08:00
gaoxin 10bfe9a7b7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-01 16:27:12 +08:00
gaoxin 1b0613673c 【坐骑】添加各个方向的偏移配置 2021-11-01 16:27:03 +08:00
ZhangBiao cdc5b5854b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-01 16:20:40 +08:00
ZhangBiao bd6a5f887d 【界面优化】剧情界面、引导、itemview、邮件、背包 2021-11-01 16:19:22 +08:00
gaoxin 44cb4eb282 【坐骑】坐骑和人物层级改为表配置 2021-11-01 15:53:33 +08:00
ZhangBiao 75827dc392 【界面优化】心魔试炼、战斗统计、法宝进阶 2021-11-01 15:36:40 +08:00
gaoxin 8a7b7c0ca3 【立绘】修复九尾狐动画闪烁的问题 2021-11-01 14:10:31 +08:00
gaoxin 4e68982a6a 【坐骑】新增九尾狐坐骑资源 2021-11-01 11:59:31 +08:00
wangzhenxing e1e2f1f663 [玉虚论道]=======结算期战斗添加屏蔽 2021-11-01 10:53:11 +08:00
gaoxin 4a764de122 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-29 18:45:56 +08:00
DESKTOP-98AVA47\Administrator 689522120c [战斗]============山河社稷图 星级检测条件修改 之前放逐的不会判断进人数 2021-11-02 06:42:19 +08:00
gaoxin 5a2d7abbfa 【立绘】牛哥立绘压缩格式修改 2021-10-29 18:45:36 +08:00
gaoxin 45228d507a 【立绘】牛哥立绘压缩格式修改 2021-10-29 18:45:16 +08:00
gaoxin 0c81ddfefe 【周卡】停留在周卡界面跨天时刷新界面显示 2021-10-29 18:27:23 +08:00
gaoxin 487a2c0a6f 【周卡】修复掉落参数错误 2021-10-29 18:12:32 +08:00
gaoxin ef8ed01cd2 【资源】重复资源名修改 2021-10-29 17:51:23 +08:00
wangzhenxing c33a6794a8 【特效】=========敖丙网球王子技能动画名称修改 2021-10-29 17:48:14 +08:00
wangzhenxing 47b1b26a75 【战斗】=====敖丙皮肤特效提交 2021-10-29 17:48:06 +08:00
jiaoyangna 53e664c775 敖丙立绘提交 2021-10-29 17:47:58 +08:00
gaoxin 947002e03a 【新增资源优化】 2021-10-29 17:44:46 +08:00
gaoxin 20b685f694 Merge branch '0功能/用户隐私协议' into china/dev 2021-10-29 16:50:20 +08:00
gaoxin d23318b53d 【周卡】红点添加,协议修改,推送逻辑添加 2021-10-29 16:43:53 +08:00
ZhangBiao af2789412d 【界面优化】提交 2021-10-29 16:26:03 +08:00
ZhangBiao c4fdc6c86a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-29 16:22:41 +08:00
liujiaqi 750761f866 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-09 23:44:00 +08:00
liujiaqi 0f63c7c12b 【资源】敖丙皮肤技能音效 2021-11-09 23:43:39 +08:00
liujiaqi de56545be4 【资源】九尾狐四不像图标资源 2021-11-09 23:15:38 +08:00
ZhangBiao 9b520a24bd Revert "【界面优化】白金装备显示框"
This reverts commit c442268050.
2021-10-29 16:22:32 +08:00
ZhangBiao 927afe7cc9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-29 16:14:16 +08:00
ZhangBiao c442268050 【界面优化】白金装备显示框 2021-10-29 16:14:06 +08:00
wangzhenxing ade77f6b44 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-29 15:50:45 +08:00
wangzhenxing 3815dc0ff3 [战斗]=======灵兽技能触发机制修改 2021-10-29 15:50:17 +08:00
wangzhenxing d004e1d459 【神魂】======战斗中 和伤害记录界面加神魂显示 2021-10-29 15:14:01 +08:00
ZhangBiao 55f2561db3 【英雄归元】英雄归元后属性值没有重置 2021-10-29 15:11:48 +08:00
ZhangBiao 3b02c6296c 【宝器属性】穿戴宝器后,游戏退出重进宝器属性没有加上,导致战力值下降 2021-10-29 14:20:21 +08:00
ZhangBiao 32985c8912 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-29 13:28:20 +08:00
ZhangBiao 5d15c33605 【优化】跨服战红点跨天后不显示,完成所有操作后红点不消失,需要重新进入 2021-10-29 13:28:04 +08:00
jiaoyangna 93d0f294e0 协议提交 2021-10-29 13:27:23 +08:00
jiaoyangna 766710dc6b Merge branch 'china/dev' into 0功能/神魂 2021-10-29 13:25:35 +08:00
gaoxin b181f4bd55 【GM】添加一些GM命令 2021-10-29 12:08:40 +08:00
jiaoyangna c735599c77 至尊降世报错修改提价 2021-10-29 12:05:01 +08:00
jiaoyangna d6c766db52 战斗界面星级修改提交 2021-10-29 11:22:34 +08:00
ZhangBiao c1f3658da4 【界面优化】提交 2021-10-29 11:13:29 +08:00
gaoxin 0fcf94a9c8 【周卡】协议,界面,逻辑搭建完成 2021-10-29 09:42:33 +08:00
jiaoyangna 1b13146915 【ID1018877】
【好感度逍遥游入口】云游值消耗还剩5点不足以继续操作,但是红点没有消失
2021-10-28 19:01:36 +08:00
jiaoyangna 4d4d2bfd99 删除log 2021-10-28 18:56:59 +08:00
jiaoyangna 6f8fa46ccd 添加log 2021-10-28 18:43:11 +08:00
jiaoyangna 02b161e84c 添加log 2021-10-28 18:42:02 +08:00
jiaoyangna d05fe62424 添加log 2021-10-28 18:39:10 +08:00
jiaoyangna 30b3adbee6 【ID1018746】
【连点】车迟斗法,十绝阵一类的玩法,快速点击进入战斗,会直接扣两个次数
2021-10-28 18:32:21 +08:00
jiaoyangna 9926717bb9 【ID1018914】
【心魔试炼】通过最高层后,点击快速挑战报服务器开小差错误提示
2021-10-28 18:20:18 +08:00
jiaoyangna 5abf6060d2 魂印商店刷新修改 2021-10-28 18:06:26 +08:00
jiaoyangna feb859b9a6 魂印商店刷新修改 2021-10-28 18:01:48 +08:00
jiaoyangna 42ed8a1617 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-28 18:00:15 +08:00
jiaoyangna acf33d10a3 【ID1018914】
【心魔试炼】通过最高层后,点击快速挑战报服务器开小差错误提示
2021-10-28 17:59:56 +08:00
ZhangBiao 4d1496580a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-28 17:30:56 +08:00
ZhangBiao dc689f3c25 【三界降魔】提交 2021-10-28 17:30:46 +08:00
jiaoyangna e95f7f9e26 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-28 17:28:44 +08:00
jiaoyangna 413d98fe82 【ID1010609】
【商店优化】魂印商店出现红色魂印时,点击刷新增加二次确认
2021-10-28 17:28:12 +08:00
ZhangBiao a590e57c89 【三界降魔】坐骑显示调整 2021-10-28 17:28:10 +08:00
ZhangBiao 2a4422aabb Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-28 17:24:06 +08:00
ZhangBiao 9c9beb78da 【三界降魔】 2021-10-28 17:23:56 +08:00
jiaoyangna 467a05b683 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-28 17:20:57 +08:00
wangzhenxing c43667aa67 【玉虚论道】=======主界面按钮位置修改提交 2021-10-28 16:53:49 +08:00
jiaoyangna ec3cee0ebb Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
#	Assets/ManagedResources/Icon/Item/icon_sbx.png.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-10-28 16:52:28 +08:00
ZhangBiao 0903782f0e 【界面优化】法宝界面错位调整 2021-10-28 16:51:00 +08:00
ZhangBiao ab2b32a35f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-28 16:41:06 +08:00
ZhangBiao 871b2ad23b 【界面优化】大闹天宫调整 2021-10-28 16:40:54 +08:00
jiaoyangna eaa1828752 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-28 16:38:50 +08:00
jiaoyangna b41e5ed0b6 【ID1018877】
【好感度逍遥游入口】云游值消耗还剩5点不足以继续操作,但是红点没有消失
2021-10-28 16:38:35 +08:00
wangzhenxing 345230b0cc 【玉虚论道】======预设修改提交 2021-10-28 16:25:35 +08:00
jiaoyangna 9249ed85cb 神魂预设修改 2021-10-28 16:19:59 +08:00
ZhangBiao 5e0e41f7bf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-28 16:03:33 +08:00
ZhangBiao 79f7339a3a 【三界降魔】提交 2021-10-28 16:03:23 +08:00
wangzhenxing 9f377eb364 [玉虚论道]==========功能按钮大小修改提交 2021-10-28 15:42:13 +08:00
jiaoyangna f4d9f0487d 神魂 2021-10-28 15:30:47 +08:00
ZhangBiao 695dd0459a 【周卡】 2021-10-28 15:22:17 +08:00
jiaoyangna 04fff0d79b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-28 15:04:07 +08:00
jiaoyangna d3bfde8830 三界降魔站立问题修改 2021-10-28 15:03:40 +08:00
ZhangBiao 134bb86342 【界面优化】 2021-10-28 14:57:50 +08:00
ZhangBiao 91efb9a43c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-28 14:43:35 +08:00
ZhangBiao 79043d7c24 【界面优化】大闹天宫 2021-10-28 14:43:23 +08:00
wangzhenxing e738e8eda8 【战斗】===========被动180 修改提交 2021-10-28 14:41:01 +08:00
ZhangBiao 8364c654b7 【界面优化】大闹天宫 2021-10-28 14:19:00 +08:00
ZhangBiao 87a95f0612 【界面优化】还原”特性“、大闹天宫 2021-10-28 14:14:30 +08:00
jiaoyangna 96a7a33743 恭送神将同步编队战力 2021-10-28 13:39:52 +08:00
jiaoyangna fb8fefd12b 加分割线 2021-10-28 11:19:39 +08:00
jiaoyangna 58044a3e91 神魂界面星星修改提交 2021-10-28 11:07:50 +08:00
jiaoyangna 478676cd21 神魂位置修改提交 2021-10-28 10:38:19 +08:00
jiaoyangna 2c23120253 神魂动画提交 2021-10-28 10:37:28 +08:00
ZhangBiao 751e396cf6 Merge branch 'china/dev' into 0优化/界面优化 2021-10-28 09:53:51 +08:00
wangzhenxing 74dea991bc [战斗]======被动355-363 提交 2021-10-28 09:48:01 +08:00
ZhangBiao ef79b1d170 【界面优化】送神、归元、法宝 2021-10-28 09:47:24 +08:00
jiaoyangna 7e42d14443 星级修改提交 2021-10-28 09:45:33 +08:00
ZhangBiao 9ac870db81 Merge branch 'china/dev' into 0优化/界面优化 2021-10-28 09:34:12 +08:00
jiaoyangna 314398f5ba 保存支援神将后,若神魂效果为首次激活,需要神将条件和对应数量神魂效果变为绿色,激活神魂等级图标和神魂效果,并获得战斗力提升,若神将正处于主线编队,同时弹出主线战斗力变化提示。 2021-10-27 18:53:36 +08:00
jiaoyangna f71c604cb2 每次切换至神魂页面时,自动滑动至已激活的最高神魂等级所在区域, 2021-10-27 18:28:07 +08:00
ZhangBiao 429366fa93 【三界降魔】调改 2021-10-27 18:26:51 +08:00
ZhangBiao 55090ed8cc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-27 18:08:28 +08:00
ZhangBiao 3b42cd525e 【三界降魔】新活动完成 2021-10-27 18:08:16 +08:00
jiaoyangna 82d0e28baa 神魂提交 2021-10-27 18:03:09 +08:00
jiaoyangna eadf4a4f1c 神魂修改提交 2021-10-27 17:42:50 +08:00
jiaoyangna 9f59cb3b64 神魂提交 2021-10-27 17:04:33 +08:00
gaoxin aabf86ba56 【山河社稷图】红点父节点错误 2021-10-27 16:36:56 +08:00
jiaoyangna d4d9b88fe7 神魂修改提交 2021-10-27 15:24:46 +08:00
gaoxin a1449fd504 【七界试炼】修复跨天红点不刷新的维妮塔 2021-10-27 15:14:47 +08:00
ZhangBiao 19a67875f8 【界面优化】大闹天宫部分 2021-10-27 13:45:05 +08:00
jiaoyangna d398c21668 神魂提交 2021-10-27 12:50:15 +08:00
ZhangBiao 36f26dc0cb 【界面优化】抽到灵兽 2021-10-27 10:45:59 +08:00
ZhangBiao ac23ef4dbd 【界面优化】竞技场主界面、轩辕宝镜、抽到灵兽界面 2021-10-27 10:37:29 +08:00
ZhangBiao f8a0a76d75 【界面优化】灵兽技能、英雄传说 2021-10-27 09:54:42 +08:00
gaoxin 266d3088e7 【战斗】修复假战斗报错 2021-10-26 21:43:00 +08:00
ZhangBiao 2f8ad786f5 【界面优化】HelpPopup 2021-10-26 18:30:32 +08:00
ZhangBiao 490f566b4d 【界面优化】技能 2021-10-26 18:23:32 +08:00
ZhangBiao 779cb4d99e 【界面优化】技能 2021-10-26 18:18:36 +08:00
wangzhenxing a38fe30800 [主角技能]=====注重主角立绘等级显示修改 2021-10-26 18:03:02 +08:00
ZhangBiao d5cf1c5395 【界面优化】归元、技能 2021-10-26 17:55:49 +08:00
ZhangBiao 353a9774c5 【界面优化】定位、恭送 2021-10-26 17:36:08 +08:00
ZhangBiao e29dd36c26 【界面优化】法宝界面 2021-10-26 16:33:20 +08:00
jiaoyangna edcdd0e81e Merge branch 'china/dev' into 0功能/神魂 2021-10-26 16:01:24 +08:00
jiaoyangna 5e8ad7dd08 神魂提交 2021-10-26 16:00:31 +08:00
jiaoyangna bdff69b0e2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-26 15:29:04 +08:00
jiaoyangna 41966a1487 逍遥游报错修改提交 2021-10-26 15:28:44 +08:00
wangzhenxing c48a16bb6c [主角技能]=====技能升级界面预设修改提交 2021-10-26 15:17:17 +08:00
gaoxin e7da10a595 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-26 14:45:34 +08:00
gaoxin a692f8d9d4 【本场最佳】主角名颜色根据修行等级改变 2021-10-26 14:45:28 +08:00
jiaoyangna b6475fb1b1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-26 14:17:56 +08:00
jiaoyangna 3d832f81cf 【ID1010556】
【优化】好感度解锁等级优化
2021-10-26 14:17:07 +08:00
gaoxin 9a2e2581f9 【资源】名称重复修改 2021-11-10 05:30:59 +08:00
gaoxin bef3a23392 【资源】名称重复修改 2021-11-10 05:28:10 +08:00
ZhangBiao 26b5a670f9 【界面优化】背包装备优化 2021-10-26 14:04:02 +08:00
wangzhenxing 4c292035cf [主角技能]======心魔试炼快速战斗不显示主角伤害记录修改 2021-10-26 14:00:23 +08:00
ZhangBiao ccd2b2ffd7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-26 10:13:41 +08:00
ZhangBiao cce7591927 【山河社稷图】小关卡单独上阵报错修改 2021-10-26 10:13:28 +08:00
gaoxin 7ac3b1bc14 【飘渺之旅】修复完成全部任务,无法领取的问题 2021-10-25 19:22:57 +08:00
ZhangBiao f51c80b277 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-25 18:40:33 +08:00
ZhangBiao 7332c761b8 【御剑行】错别字 2021-10-25 18:40:22 +08:00
gaoxin 8fdb8942e1 【飘渺之旅】修复第一天显示了重复的任务的问题 2021-10-25 18:15:48 +08:00
liujiaqi 59c1629b18 【资源】四不像icon 2021-11-07 17:32:11 +08:00
wangzhenxing fbf66138ca [玉虚论道]======玉虚段位奖励界面特效层级修改提交 2021-10-25 17:19:01 +08:00
ZhangBiao 9c76f42161 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-25 16:47:15 +08:00
ZhangBiao e8f0a9b4a1 【御剑行】界面黑屏倒计时结束后弹出排行榜 2021-10-25 16:46:51 +08:00
wangzhenxing 7b406e1c4b 【战斗】===========主角技能使用 队伍战斗力 接口修改 2021-10-25 16:37:41 +08:00
gaoxin 04a1196586 【战斗力】一旦战斗力改变就让后端重新计算战斗力 2021-10-25 16:13:48 +08:00
wangzhenxing 237767eb29 【战斗】=============灵兽技能 8 回合cd判断修改 2021-10-25 15:54:38 +08:00
gaoxin 102c24cd8e 【至尊降世】文字遮挡优化 2021-10-25 14:53:32 +08:00
gaoxin ab20dc943c 【用户隐私协议】内容完善 2021-10-25 13:53:44 +08:00
wangzhenxing 09755c8d12 [战斗]==============测试战斗添加主角技能检测,攻击就是队伍战斗力 2021-10-25 13:48:48 +08:00
ZhangBiao 0cef23209c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-25 11:54:13 +08:00
ZhangBiao 7871064069 【修为】Tips修改 2021-10-25 11:54:04 +08:00
wangzhenxing 7ae770a3b0 [战斗]=============伤害力公式修改 防御 乘2 2021-10-25 11:48:54 +08:00
ZhangBiao abd9795933 【百宝商会】红点提交 2021-10-25 11:15:27 +08:00
ZhangBiao b267ad30c6 【百宝商会】取消QA 2021-10-25 10:47:12 +08:00
wangzhenxing b7a2cee564 玉虚战斗记录敌方分数显示修改 2021-10-22 18:37:42 +08:00
wangzhenxing d51a4292f3 协议提交 主角技能图标显示修改 玉虚战斗记录敌方分数修改 2021-10-22 18:30:09 +08:00
ZhangBiao 60e71f5e42 【御剑行】哎,提交 2021-10-22 18:20:08 +08:00
ZhangBiao 929de39da9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 18:16:05 +08:00
ZhangBiao cc2cfd7a21 【百宝商会、御剑行】按钮一致性提交、显示修改 2021-10-22 18:15:55 +08:00
jiaoyangna 00ae40d23a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 18:07:09 +08:00
jiaoyangna 7ed825b4c1 飘渺之旅修改提交 2021-10-22 18:06:44 +08:00
ZhangBiao de2ce6919c 【御剑行】提交 2021-10-22 17:58:07 +08:00
ZhangBiao 0d8c381ace Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 17:45:56 +08:00
ZhangBiao 2bb589b5dd 【御剑行】竞猜界面点击任意位置关闭修改 2021-10-22 17:45:46 +08:00
wangzhenxing 5e541238de [战斗]=============128 129 130 131 修改 添加最大限制 2021-10-22 17:34:15 +08:00
jiaoyangna fa36828e1c Revert "至尊降世活动结束不关闭提交"
This reverts commit 031895a9d1.
2021-10-22 17:28:09 +08:00
jiaoyangna 031895a9d1 至尊降世活动结束不关闭提交 2021-10-22 17:24:41 +08:00
jiaoyangna f7db9fc907 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 17:22:18 +08:00
jiaoyangna 73b9fad19d 至尊降世活动兼容提交 2021-10-22 17:21:31 +08:00
ZhangBiao e821387c93 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 16:47:39 +08:00
gaoxin c1352e0a59 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-10 02:52:56 +08:00
gaoxin 24ea182587 【最佳】加入主角伤害展示 2021-11-10 02:52:51 +08:00
gaoxin 3f2ce26aff Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-10 01:17:33 +08:00
gaoxin 99985c442d 【积天豪礼】红点加入主界面下拉按钮红点 2021-11-10 01:17:28 +08:00
gaoxin 8d8a50a0ce Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-10 01:01:09 +08:00
gaoxin c080345afc 【积天豪礼】主界面按钮资源上传 2021-11-10 01:01:05 +08:00
gaoxin 7a5f41ef46 【积天豪礼】分离到主城 2021-11-10 00:58:39 +08:00
gaoxin 8125b21af3 【跨服】修复七界试炼红点刷新不及时的问题 2021-11-10 00:56:37 +08:00
ZhangBiao 0508d1d652 【御剑行】跨期修改 2021-10-22 16:47:30 +08:00
jiaoyangna acc912a0e7 Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
2021-10-22 15:52:33 +08:00
jiaoyangna f5dc4a20b2 神魂出版提交 2021-10-22 15:47:59 +08:00
ZhangBiao ac6dca4805 【御剑行】赛季结束不可打开竞猜 2021-10-22 15:46:35 +08:00
ZhangBiao 0f0c0586bf 【御剑行】红点 2021-10-22 15:44:19 +08:00
ZhangBiao c16004cf3b 【百宝商会】增加次数显示 2021-10-22 15:41:49 +08:00
ZhangBiao 26e980b503 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 14:49:08 +08:00
ZhangBiao 0d94f23e41 【御剑行】红点提交 2021-10-22 14:48:56 +08:00
wangzhenxing 7ad105855a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 14:44:40 +08:00
wangzhenxing 8590face13 【战斗】========主角技能名称图片资源提交 2021-10-22 14:44:11 +08:00
ZhangBiao befea57bbc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 14:29:09 +08:00
ZhangBiao 7da9ee8b6d 【弹窗优化】邮件、每日任务 2021-10-22 14:28:59 +08:00
ZhangBiao 5aba21341c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 14:22:23 +08:00
ZhangBiao 1f5f4f15c3 【弹窗优化】提交 2021-10-22 14:22:12 +08:00
wangzhenxing fc3edefd82 【战斗】=====hot buff修改提交 2021-10-22 14:11:25 +08:00
wangzhenxing 8035e3f6f3 [战斗]==============战斗消息位置修改 2021-10-22 14:04:15 +08:00
wangzhenxing eefaa33687 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 13:59:08 +08:00
wangzhenxing e0b7df4206 [战斗]==========被动199 历战之躯 被动修改 2 2021-10-22 13:57:51 +08:00
ZhangBiao 609b191785 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 13:53:22 +08:00
ZhangBiao 22941d0af5 【弹窗优化】公会、公告、服务器列表】英雄信息 2021-10-22 13:53:10 +08:00
wangzhenxing 2a6f3389b3 [战斗]=============被动199 历战之躯 修改 2021-10-22 13:35:44 +08:00
ZhangBiao cdc17b555e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 13:22:51 +08:00
ZhangBiao 31e8f4c726 【弹窗优化】物品信息、自选箱、排行榜、限时活动奖励弹窗 2021-10-22 13:22:39 +08:00
wangzhenxing d93e0a9c4e 角色技能升级按钮添加动效 2021-10-22 13:15:08 +08:00
wangzhenxing 73361ef6c9 玉虚奖励预设修改提交 2021-10-22 12:09:10 +08:00
gaoxin 7b486f1559 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-23 03:01:26 +08:00
gaoxin 25a14f7a79 【商店】免费次数的商店,取消刷新后今日不再显示满次红点的功能,满次后刷新红点显示添加 2021-10-23 03:01:20 +08:00
gaoxin 582ab51299 【山河社稷图】每日奖励文字修改 2021-10-22 21:25:49 +08:00
wangzhenxing 4518c8c175 修行技能bug修改提交 2021-10-22 11:56:46 +08:00
ZhangBiao 7b20915c6c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 11:27:58 +08:00
ZhangBiao 39aa09f317 【点击黑色区域关闭】 2021-10-22 11:27:47 +08:00
ZhangBiao e48606b648 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 11:21:53 +08:00
ZhangBiao 1215e46af8 【御剑行】点击商店返回后增加请求 2021-10-22 11:21:42 +08:00
jiaoyangna bfd2e06ecc 至尊降世修改提交 2021-10-22 11:20:24 +08:00
ZhangBiao abbcc52f01 【御剑行】提交 2021-10-22 10:57:01 +08:00
ZhangBiao fa818dac35 【御剑行】提交 2021-10-22 10:41:20 +08:00
ZhangBiao 9fd8d6d886 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 10:25:36 +08:00
ZhangBiao a732dadb5f 【御剑行】修改提交 2021-10-22 10:25:20 +08:00
wangzhenxing eb5867b31c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 10:21:36 +08:00
wangzhenxing c494145ff8 主角技能添加屏蔽 2021-10-22 10:21:07 +08:00
ZhangBiao 19d4f27f76 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 10:20:42 +08:00
ZhangBiao 85819fcbae 【御剑行】红点调整 2021-10-22 10:20:30 +08:00
wangzhenxing ae47df29bb 【红点】=============修行技能红点提交 2021-10-22 10:08:53 +08:00
ZhangBiao 747cb5b179 【御剑行】修改提交 2021-10-22 10:00:19 +08:00
ZhangBiao d8da0bb26a 【协议】补提 2021-10-22 09:33:54 +08:00
ZhangBiao cef99194af Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 09:26:20 +08:00
ZhangBiao 2ab4be658d 【主角修为】图标顺序调整 2021-10-22 09:26:09 +08:00
jiaoyangna 68cbb5905a 至尊降世修改提交 2021-10-21 18:58:36 +08:00
jiaoyangna 4e89351ef8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-21 18:12:41 +08:00
jiaoyangna b24061ccd0 至尊降世报错修改提交 2021-10-21 18:12:28 +08:00
gaoxin 6c9f0098cf 【逍遥游】修复加速状态下,转盘卡死问题 2021-10-21 18:02:33 +08:00
jiaoyangna ad84124cd9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-21 18:00:20 +08:00
jiaoyangna bdb8510d92 坐骑界面修改提交 2021-10-21 18:00:05 +08:00
ZhangBiao 9e0ca64dbd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-21 17:55:20 +08:00
ZhangBiao e3b9c82ac7 【七界试炼】左右按钮在调整 2021-10-21 17:55:11 +08:00
wangzhenxing fb7ad25c56 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-21 17:49:46 +08:00
wangzhenxing 05669fe98b 红点常量提交 2021-10-21 17:49:30 +08:00
wangzhenxing 7261a428fb 主角技能伤害提交 2021-10-21 17:47:49 +08:00
ZhangBiao 869b65dd95 Merge branch 'china/dev' into 0活动开发聚集地/百宝商会第二季
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab
2021-10-21 17:47:34 +08:00
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
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
jiaoyangna 06a8251a40 神魂界面提交 2021-10-20 18:02:09 +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
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
jiaoyangna 9e83a95373 新增资源 2021-10-20 11:17:11 +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
gaoxin b2a163ae3d 【百宝商会第二季】预设上传 2021-10-19 19:01:40 +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 e647486e07 【战斗】失败界面我要变强按钮资源修改-预设修改 2021-10-19 14:05:02 +08:00
gaoxin 60c8973644 【战斗】失败界面我要变强按钮资源修改 2021-10-19 14:03:52 +08:00
gaoxin 335bc04645 【每日豪礼】选中时也显示红点 2021-10-19 13:52:58 +08:00
ZhangBiao bbc98ac478 【牛气冲天】进度显示不全修复 2021-10-19 13:35:10 +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
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
ZhangBiao 99fb560ca2 【七界试炼】上下层按钮调整 2021-10-19 10:12:41 +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
ZhangBiao 615fa3f7d7 【寻宝迷踪】去除log 2021-10-18 18:18:04 +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
gaoxin 334090870d 【挚礼月卡】修复按钮事件遮挡 2021-10-18 16:21:19 +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
gaoxin c9ccd9932b 【挚礼月卡】预制体修改 2021-10-18 15:28:43 +08:00
gaoxin 761f8d660c 【挚礼月卡】资源上传 2021-10-18 15:16:24 +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
jiaoyangna b50e5ee2bf Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_zn01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_02.mp3.meta
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-10-18 10:38:49 +08:00
jiaoyangna 097d5cf1cc 神魂初版提交 2021-10-18 10:36:32 +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 0aef47cc9f 【牛气冲天、灵兽宝阁】点击奖励显示错误修改 2021-10-16 16:00:34 +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
jiaoyangna 6cae26f8bb 红点位置修改提交 2021-10-16 14:48:18 +08:00
ZhangBiao 7e5f122a11 【适配】1080*2550 觉醒成功界面文字被切 2021-10-16 13:54:50 +08:00
ZhangBiao 1068806f6b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-16 13:45:58 +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
jiaoyangna aba4617fcd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-15 18:07:21 +08:00
jiaoyangna 01fb1af93f 【ID1010483】
【优化】挂机界面,额外加成改为整数值,且更换资源文件
2021-10-15 18:07:07 +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 11bf1918dc 【御剑行】提交问好 2021-10-15 14:06:18 +08:00
ZhangBiao cbef4e021b 【御剑行】提交 2021-10-15 14:02:33 +08:00
jiaoyangna 3bb3e41f09 bat Resource Commit:2021/10/15,14:02:03 2021-10-15 14:02:03 +08:00
jiaoyangna dafa14ffb0 坐骑资源修改提交 2021-10-15 13:44:49 +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 2ed7770259 排行榜上小人方向修改
(cherry picked from commit 35e0b7e419)
2021-10-15 12:13:37 +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 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