Commit Graph

11527 Commits (09a810af3f56fdf03d161485788352a0df7843bf)
 

Author SHA1 Message Date
ZhangBiao b07f3ce2d5 【商城界面】提交 2021-12-14 19:16:30 +08:00
jiaoyangna 7e85eeaa90 【ID1010843】
增加英雄回退功能
2021-12-14 17:57:21 +08:00
ZhangBiao 88d8cb12a3 Merge branch '0功能/命格' of http://60.1.1.230/gaoxin/JL_Client into 0功能/命格 2021-12-14 17:52:32 +08:00
ZhangBiao 56aad6a959 【命格】提交 2021-12-14 17:52:15 +08:00
jiaoyangna 89a034a85e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-14 17:26:02 +08:00
jiaoyangna 0c83c3412e 【ID1010843】
增加英雄回退功能
2021-12-14 17:25:44 +08:00
ZhangBiao 181e5dcb63 【命格】背包页签位置 2021-12-14 17:19:22 +08:00
ZhangBiao e1a9459101 【命格】提交 2021-12-14 16:17:49 +08:00
ZhangBiao bf46f1a6f6 【命格】提交 2021-12-14 15:55:47 +08:00
ZhangBiao 98308fe892 Merge branch 'china/dev' into 0功能/命格 2021-12-14 15:32:05 +08:00
ZhangBiao 85dfd5c299 【命格】提交 2021-12-14 15:31:30 +08:00
ZhangBiao ad71840333 【GM】增加删除操作 2021-12-14 15:01:39 +08:00
skuld d8979d77bc bat Resource Commit:2021/12/14,14:00:07 2021-12-14 14:00:07 +08:00
skuld e85d95b008 Revert "bat Resource Commit:2021/12/14,13:57:41"
This reverts commit c246aa8095.
2021-12-14 13:59:01 +08:00
skuld c246aa8095 bat Resource Commit:2021/12/14,13:57:41 2021-12-14 13:57:42 +08:00
gaoxin 1691fd03da 【战斗】优化身外化身casting显示时间 2021-12-14 13:51:41 +08:00
ZhangBiao 31ce94705d 【商城界面】资源提交 2021-12-14 13:15:20 +08:00
ZhangBiao 887e444547 【新商城】提交 2021-12-14 11:18:25 +08:00
gaoxin 82ced48859 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-14 10:07:59 +08:00
gaoxin 55f324445e 【月卡】修复同时激活时提示文字错误 2021-12-14 10:07:42 +08:00
ZhangBiao 4cb31b3ba0 【森罗幻境】修复英雄选框底图消失问题 2021-12-14 10:05:49 +08:00
ZhangBiao f248583e9e Merge branch 'china/dev' into 0功能/命格 2021-12-14 09:49:12 +08:00
ZhangBiao 13815dd2a5 【命格】提交 2021-12-14 09:48:28 +08:00
jiaoyangna 6a6f67d0ce Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-14 09:35:51 +08:00
jiaoyangna 663957bbce 去掉帮助按钮,修改文字 2021-12-14 09:35:35 +08:00
gaoxin ab085087b0 【战斗】取消哪吒的技能后摇延时,可能会导致卡死 2021-12-13 18:56:49 +08:00
gaoxin 3d19df7cb2 【关卡新条件】卸下再穿戴装备后关卡界面卡死 2021-12-13 18:43:27 +08:00
ZhangBiao 0b5c84931a 【命格】提交 2021-12-13 18:25:35 +08:00
jiaoyangna 386e56aec0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-13 17:44:29 +08:00
jiaoyangna b4e7faa04c 文字修改 2021-12-13 17:44:14 +08:00
ZhangBiao 1f249735a3 【命格】提交 2021-12-13 17:38:13 +08:00
wangzhenxing 221f5cb13e 【战斗】=====被动99 372 211 188被动添加空判断 2021-12-13 17:36:46 +08:00
gaoxin a39a791f9f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-13 17:30:00 +08:00
gaoxin ba182c0671 【特效】女儿国王特效白片修复 2021-12-13 17:29:44 +08:00
jiaoyangna abed1e0e9d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-13 17:27:49 +08:00
jiaoyangna bfd0cd7184 适配修改提交 2021-12-13 17:27:29 +08:00
ZhangBiao 0b9bd476dd Merge branch 'china/dev' into 0功能/命格 2021-12-13 17:26:43 +08:00
ZhangBiao d91811a555 【命格】提交 2021-12-13 17:26:08 +08:00
skuld 07b7374288 bat Resource Commit:2021/12/13,17:25:54 2021-12-13 17:25:55 +08:00
wangzhenxing 3ede6d5973 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-13 17:19:34 +08:00
wangzhenxing 759de1e7ec [战斗]======主角技能释放添加排序 2021-12-13 17:19:02 +08:00
gaoxin c680ea0940 【战斗跳过】跳过限制只对关卡战斗生效 2021-12-13 17:17:51 +08:00
gaoxin f8fa462e4d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-13 17:07:37 +08:00
gaoxin ec916ef6f0 【引导战斗】修复casting层级错误,修复男女角色显示错误 2021-12-13 17:07:31 +08:00
jiaoyangna 8d90ab771a 资源提交 2021-12-13 17:04:39 +08:00
jiaoyangna 9bb48dab19 招募基金修改 2021-12-13 16:53:29 +08:00
jiaoyangna e2df6fac9f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-13 16:32:07 +08:00
jiaoyangna acca1c0eae 添加一个按钮 2021-12-13 16:31:41 +08:00
gaoxin 494181e06c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-13 16:25:15 +08:00
gaoxin 064505813a 【战斗】修复战斗结束后立刻再进入战斗会报错卡死 2021-12-13 16:25:09 +08:00