Commit Graph

11268 Commits (c246aa8095b08eebba4ee01bad24b51ce855e65e)
 

Author SHA1 Message Date
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
jiaoyangna 53e04ac0d0 红点修改提交 2021-12-13 13:46:40 +08:00
ZhangBiao 6f06f68636 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-13 12:15:04 +08:00
ZhangBiao ab5b654b73 【法宝聚灵】增加特效 2021-12-13 12:14:46 +08:00
wangzhenxing 52937f3a67 [战斗]======效果133修改,治疗接口添加容错 2021-12-13 11:50:50 +08:00
ZhangBiao 6e92bbd082 【红点】主题活动入口显示红点,签到后或领达人活动奖励后,红点消失 2021-12-13 11:04:27 +08:00
ZhangBiao 3bc06e9b8e 【白金装备】装备穿戴界面,四星白金装备比五星白金装备排序靠前,其他部位没问题 2021-12-13 10:14:54 +08:00
gaoxin 8ba26cd8b4 【协议】公会副本伤害数值类型修改 2021-12-10 18:30:26 +08:00
gaoxin eeda6a80c5 【战斗】修复主角技能卡死 2021-12-10 18:27:51 +08:00
gaoxin 3063e8244c 【协议】公会副本伤害数据类型修改 2021-12-10 18:09:23 +08:00
gaoxin 8fa3cfd2d1 【月卡】修改月卡激活时的提示文字 2021-12-10 17:39:18 +08:00
gaoxin 3835273079 【关卡】条件新增 2021-12-10 17:37:07 +08:00
gaoxin a8186e776c 【月卡】修改月卡激活时的提示文字 2021-12-10 17:36:04 +08:00
gaoxin d2adaaba8d 【特权】二倍速不再判断等级提示 2021-12-10 16:39:10 +08:00
wangzhenxing 307264537c 【战斗】======被动301 修改 2021-12-10 16:25:34 +08:00
jiaoyangna 6f34492c24 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-10 16:09:49 +08:00
jiaoyangna 9d218ee512 文字颜色修改提交 2021-12-10 16:09:28 +08:00
wangzhenxing 150e37ae78 [战斗]======效果144修改 护盾buff修改 2021-12-10 15:22:18 +08:00
jiaoyangna ad38176660 报错修改提交 2021-12-10 15:08:17 +08:00
jiaoyangna 586305b681 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-10 14:58:57 +08:00
jiaoyangna 9069b2ed2c 招募秘宝提交 2021-12-10 14:58:14 +08:00
wangzhenxing cecb0ddfc7 【战斗】========被动405 407 409修改 2021-12-10 14:01:04 +08:00
gaoxin 7bbfa16224 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-10 13:44:55 +08:00
gaoxin c10667f77d 【战斗】首领关卡2回合后才可以跳过 2021-12-10 13:44:48 +08:00
jiaoyangna fe0efcb631 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
2021-12-10 13:42:27 +08:00
jiaoyangna e33181dddb 招募秘宝提交 2021-12-10 13:41:03 +08:00
gaoxin ad58a58843 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-10 11:58:54 +08:00
gaoxin 9ec7d07fbb 【身外化身剧情】孙悟空可配置为主角 2021-12-10 11:58:42 +08:00
wangzhenxing 33d25289b3 【战斗】=======变身卡技能提交 2021-12-10 11:52:10 +08:00
gaoxin 836d216309 【战斗】主角出现在战斗中时缺少动画处理 2021-12-10 09:57:08 +08:00
gaoxin ffe01ddf16 【引导战斗】添加根据主角释放技能次数显示对话的功能 2021-12-09 18:05:47 +08:00
gaoxin 6f3774c030 【云梦祈福】不再请求数据 2021-12-09 18:04:29 +08:00
wangzhenxing 889a49576c 【战斗】=======第五期神魂提交 2021-12-09 14:25:02 +08:00
gaoxin 10b275ea33 【引导】引导类型19:切换到3倍速 2021-12-09 11:17:47 +08:00
gaoxin 34b02496f2 【战斗】二倍速,三倍速解锁条件修改,跳过条件修改 2021-12-09 09:46:02 +08:00
gaoxin f846d6f17e 【战斗】加入三倍速 2021-12-08 16:39:37 +08:00
gaoxin d64715ce01 【牛气冲天】页签根据数据判断显隐 2021-12-08 15:56:08 +08:00
jiaoyangna 49500da08e 添加名次显示 2021-12-08 14:32:18 +08:00
jiaoyangna 1136879d55 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-08 14:03:43 +08:00