Commit Graph

9911 Commits (31ce94705da9e80cc2faf96cc2541be81fc257ff)

Author SHA1 Message Date
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
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
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
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
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
jiaoyangna 0b58f64ff2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-13 16:21:05 +08:00
jiaoyangna 52ad37eee0 【ID1019400】
【月卡】购买招募秘宝后不弹出激活月卡提示,领取招募秘宝奖励时才弹出,并且提示不正确
2021-12-13 16:20:48 +08:00
gaoxin b5750526b2 【月卡】修复月卡提示显示错误 2021-12-13 16:07:51 +08:00
wangzhenxing f2738790f5 [战斗]=======抗暴率 加减 仙音环绕 buff图标颜色修改 2021-12-13 16:00:42 +08:00
jiaoyangna b31036ccc5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-13 15:52:00 +08:00
jiaoyangna a1f6ac1362 【招募秘宝】领取完奖励后,重登,中高级奖励显示可领取 2021-12-13 15:51:40 +08:00
gaoxin 7cdc1ff38a Merge branch '0功能/关卡新条件' into china/dev 2021-12-13 15:49:25 +08:00
gaoxin f920d4807c 【无用log删除】 2021-12-13 15:49:02 +08:00
gaoxin c46d18eb17 【关卡新条件】好感度等级获取方式修改,逍遥游完成次数协议添加 2021-12-13 15:48:26 +08:00
gaoxin ceb5f6232e 【剧情】战斗剧情结束回调事件 2021-12-13 15:27:45 +08:00
gaoxin 6c259fbf26 【关卡新条件】完善 2021-12-13 15:27:17 +08:00
gaoxin 4a9c197563 Merge branch 'china/dev' into 0功能/关卡新条件
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua
2021-12-13 15:23:27 +08:00
jiaoyangna 5f926ebbce Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-13 15:14:03 +08:00
jiaoyangna 244aa76319 【ID1019396】
【招募秘宝】激活秘宝后没有获得980妖晶
2021-12-13 15:13:31 +08:00
wangzhenxing 0bb0031e86 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-13 15:10:13 +08:00
wangzhenxing 95f22a2be6 [战斗]======盾buff去除log 2021-12-13 15:09:57 +08:00
jiaoyangna e5c302f6b7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-13 15:08:35 +08:00
jiaoyangna 2079a4efcb 适配修改提交 2021-12-13 15:08:02 +08:00
wangzhenxing 23467d0ff6 [战斗]=====变身卡复活机制提交 2021-12-13 14:52:57 +08:00
wangzhenxing 58d08c65cc 【战斗】=======战斗buff图标资源提交 2021-12-13 14:31:06 +08:00
jiaoyangna 28584ad6f2 竞技试炼资源提交 2021-12-13 14:17:38 +08:00
jiaoyangna 1660b65c71 竞技试炼资源提交 2021-12-13 14:17:07 +08:00
jiaoyangna bb1e41633a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-13 13:46:55 +08:00