Commit Graph

10871 Commits (2f7e5421a87ca943c2f61cd4f62a7cf4c73e22b4)
 

Author SHA1 Message Date
wangzhenxing 2f7e5421a8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-03 18:20:06 +08:00
wangzhenxing 40e639098b [战斗]======仙音环绕修改 2021-12-03 18:19:29 +08:00
jiaoyangna b19801639d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-03 18:03:53 +08:00
jiaoyangna 660bbdf997 方寸寻宝修改提交 2021-12-03 18:03:36 +08:00
wangzhenxing b9763ad25e 【战斗】=====变身卡提交 2021-12-03 17:17:47 +08:00
ZhangBiao 7348534847 【去除多余活动信息】 2021-12-03 16:46:40 +08:00
ZhangBiao 13991ac0de Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-03 16:09:49 +08:00
ZhangBiao f3f74c5ff1 【跨服战红点】灵脉被打跨服战没红点 2021-12-03 16:09:33 +08:00
luyao c7edbfc191 【音效调整】揭开大圣符印部分音效声量调大 2021-12-03 14:54:08 +08:00
ZhangBiao ee5c9d7362 【连购礼包】资源文件 2021-12-03 13:34:44 +08:00
ZhangBiao bf7dd87000 Merge branch 'china/dev' into 0活动开发聚集地/连购礼包 2021-12-03 13:25:40 +08:00
ZhangBiao 8e7afd757d 【连购礼包】提交 2021-12-03 13:21:15 +08:00
wangzhenxing 8ccea4cf70 [资源]======牛魔王皮肤 头像 卡牌资源提交 2021-12-03 11:30:55 +08:00
wangzhenxing 94fd5fb5cf 【战斗】=======被动130修改 2021-12-03 10:27:41 +08:00
ZhangBiao ed5e0f6ab1 Merge branch 'china/dev' into 0活动开发聚集地/连购礼包 2021-12-03 10:00:31 +08:00
ZhangBiao 4c7b379ce7 【灵脉秘境】1号灵脉的灵气数值超框 2021-12-02 19:49:49 +08:00
ZhangBiao ebff38ffc4 【连购礼包】提交 2021-12-02 19:36:28 +08:00
wangzhenxing d424af4e4e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-02 17:43:00 +08:00
wangzhenxing bbef7796ca [战斗]=======第四期神魂 2021-12-02 17:42:31 +08:00
ZhangBiao 55f2e6e783 Merge branch 'china/dev' into 0活动开发聚集地/连购礼包
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-12-02 17:16:00 +08:00
ZhangBiao 4d1799a124 【连购礼包】提交 2021-12-02 17:13:33 +08:00
ZhangBiao bc69e64b81 【连购礼包】提交 2021-12-02 16:27:24 +08:00
jiaoyangna aa0e501b4b ID1019319】
【神将情报】神将到达330级时情报右侧显示提示应为“最高等级”
2021-12-02 16:01:01 +08:00
jiaoyangna 43d40d90e1 【ID1019316】
【神将归元】7星玉帝归元弹窗显示5星,实际只是显示问题
2021-12-02 15:55:08 +08:00
jiaoyangna 7b8306f98a 【ID1010715】
【公会信息优化】公会名称底框右侧添加编辑图标
2021-12-02 15:31:23 +08:00
jiaoyangna 1253466912 天地烘炉提交 2021-12-02 15:18:56 +08:00
ZhangBiao 73d0e79bb1 【连购礼包】资源文件 2021-12-02 14:18:21 +08:00
ZhangBiao f431eea90c 【连购礼包】提交 2021-12-02 14:03:38 +08:00
ZhangBiao cf971541e1 【大闹天宫】无法挑战修改 2021-12-02 10:35:06 +08:00
jiaoyangna e7cc7ee41e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-01 17:02:41 +08:00
jiaoyangna 40fcfcdfc2 化身描述修改 2021-12-01 17:02:25 +08:00
ZhangBiao c637166494 【灵兽宝阁】确认框错误修改 2021-12-01 16:55:05 +08:00
ZhangBiao 63bf32f335 【战斗】白片尝试修改 2021-12-01 13:59:22 +08:00
ZhangBiao 1725c1dc28 Revert "【战斗】白片尝试修改"
This reverts commit 0f8a995163.
2021-12-01 13:58:49 +08:00
ZhangBiao 0f8a995163 【战斗】白片尝试修改 2021-12-01 13:57:11 +08:00
ZhangBiao 1805fe0848 【装备】出售单个装备报错修改 2021-12-01 10:16:42 +08:00
luyao ed655ea6a7 【优化】
白素贞小头像、半身像
炼丹师半身像
朝向左>右
2021-12-01 09:20:55 +08:00
gaoxin ba0680eac6 【战斗】皮肤朝向修改 2021-11-30 23:14:06 +08:00
wangzhenxing 898f3a9b99 [立绘朝向]=======英雄列表初始化立绘朝向修改 2021-11-30 22:53:49 +08:00
gaoxin 2e2c4292b6 【引导】修复修为引导位置错误 2021-11-30 21:27:26 +08:00
wangzhenxing 6b742c0788 [立绘朝向]======皮肤立绘朝向修改 2021-11-30 20:43:56 +08:00
ZhangBiao 9e83ce264d 【引导】升级后不弹引导修改 2021-11-30 15:43:02 +08:00
luyao af560c2aed 【音效文件清理】删除过往无用音效 2021-11-30 14:23:18 +08:00
luyao cf3993fbfb 妖系 受击音效调整 2021-11-30 14:12:35 +08:00
gaoxin f090e9b792 【特效】哪吒技能特效时间优化 2021-11-30 13:42:49 +08:00
jiaoyangna bd379c4114 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-30 13:23:44 +08:00
jiaoyangna 12fb7447cc 坐骑合成修改 2021-11-30 13:23:29 +08:00
luyao f4a440e1a3 【妖】普攻 受击音效再次调整 2021-11-30 12:35:45 +08:00
luyao 1dc75e4580 【妖】普攻 攻击,受击音效;
【道】受击音效修改
2021-11-30 12:15:37 +08:00
luyao 7a8c43ed57 添加 人(攻击,受击)、佛(攻击、受击) 普攻音效 2021-11-30 11:37:49 +08:00