Commit Graph

11552 Commits (b696084384c569c9964f080935c0dbfe79800a15)
 

Author SHA1 Message Date
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
ZhangBiao f444315fee Merge branch 'china/dev' into 0功能/命格 2021-12-10 18:32:41 +08:00
ZhangBiao 440c9cdb92 【命格】提交 2021-12-10 18:32:08 +08:00
gaoxin 8ba26cd8b4 【协议】公会副本伤害数值类型修改 2021-12-10 18:30:26 +08:00
gaoxin eeda6a80c5 【战斗】修复主角技能卡死 2021-12-10 18:27:51 +08:00
ZhangBiao c11848b98a 【命格】红点提交 2021-12-10 18:27:43 +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
ZhangBiao ad589aa449 【命格】提交 2021-12-10 17:18:18 +08:00
gaoxin d2adaaba8d 【特权】二倍速不再判断等级提示 2021-12-10 16:39:10 +08:00
wangzhenxing 307264537c 【战斗】======被动301 修改 2021-12-10 16:25:34 +08:00
ZhangBiao 94c98be0e5 【命格】提交 2021-12-10 16:17:47 +08:00
ZhangBiao 4b4ae7a608 【命格】提交 2021-12-10 16:16:41 +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
ZhangBiao d3a2fdf110 【命格】提交 2021-12-10 16:07:46 +08:00
ZhangBiao 1ae26afed2 【命格】跳转 2021-12-10 15:46:35 +08:00
ZhangBiao a3c24ee4b7 【命格】提交 2021-12-10 15:29:03 +08:00
wangzhenxing 150e37ae78 [战斗]======效果144修改 护盾buff修改 2021-12-10 15:22:18 +08:00
jiaoyangna ad38176660 报错修改提交 2021-12-10 15:08:17 +08:00
ZhangBiao 70f5308d1d 【命格】宝石资源提交 2021-12-10 15:05:18 +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
ZhangBiao 9140a632f9 【命格】提交 2021-12-10 14:57:23 +08:00
ZhangBiao f09556242d Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
2021-12-10 14:16:28 +08:00
ZhangBiao 982137c9b7 【命格】提交 2021-12-10 14:14:08 +08:00
wangzhenxing cecb0ddfc7 【战斗】========被动405 407 409修改 2021-12-10 14:01:04 +08:00
ZhangBiao 82c89e5e7d 【命格】提交 2021-12-10 13:57:24 +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
ZhangBiao f067ae5080 【命格】提交 2021-12-10 11:40:15 +08:00
ZhangBiao bab62f274c 【命格】提交 2021-12-10 11:01:44 +08:00
gaoxin 836d216309 【战斗】主角出现在战斗中时缺少动画处理 2021-12-10 09:57:08 +08:00
ZhangBiao e304f2136b Merge branch 'china/dev' into 0功能/命格 2021-12-09 20:18:21 +08:00
ZhangBiao cb5cf43089 【命格】提交 2021-12-09 20:17:37 +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
ZhangBiao d056b1479a Merge branch 'china/dev' into 0功能/命格 2021-12-09 13:30:30 +08:00
ZhangBiao 9875630085 【命格】提交 2021-12-09 13:29:16 +08:00