Commit Graph

10398 Commits (3a70720f9c63ce7e47237833ddade375357bbef4)
 

Author SHA1 Message Date
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