Commit Graph

47 Commits (cddc94f41e34ba465df1bfdb2814a7a545fb795e)

Author SHA1 Message Date
zhangqiang 20795b326a 【灵兽系统】bug 2020-11-02 11:53:26 +08:00
zhangqiang d5e4b46e45 【灵兽系统】bug 同步到dev 2020-11-02 11:00:21 +08:00
zhangqiang 005f36c524 【灵兽系统】 修改bug 2020-10-31 14:49:58 +08:00
zhangqiang 4f25b8cc98 【灵兽系统】 修改bug 2020-10-30 17:48:49 +08:00
zhangqiang c22b0d34d5 【灵兽系统】 红点刷新 2020-10-29 16:58:00 +08:00
zhangqiang 17465d4d99 【灵兽系统】 bug 2020-10-29 11:01:03 +08:00
zhangqiang e60d24f9a3 【灵兽系统】 修改bug 2020-10-28 11:48:36 +08:00
zhangqiang 8070a4fa47 【灵兽系统】 星级居中修改 2020-10-28 10:35:50 +08:00
zhangqiang a20217223a 【灵兽系统】 添加碎片合成红点 2020-10-27 17:02:37 +08:00
wangzhenxing eb109ff09b 灵兽信息显示界面修改 2020-10-27 11:23:14 +09:00
jiaoyangna 9c7839540a [灵兽系统]羁绊排序,羁绊红点修改 2020-10-26 17:40:54 +08:00
zhangqiang 35f64de903 【灵兽系统】 修改预设加载 2020-10-26 17:11:04 +08:00
gaoxin e96bfbdbf5 【灵兽】获取全部灵兽信息接口修改返回数组,修复打开灵兽信息界面报错 2020-10-26 14:57:01 +08:00
zhangqiang 5a72414908 灵兽修改提交 2020-10-26 11:34:01 +08:00
zhangqiang 3fa9583f56 灵兽修改提交 2020-10-26 10:10:29 +08:00
wangzhenxing a0270d471b 灵兽提交 2020-10-24 18:41:20 +09:00
jiaoyangna 87b9c2dd0d 灵兽羁绊,御兽斋红点提交 2020-10-29 16:17:09 +08:00
zhangqiang 19f13e3cf6 灵兽连续升级修改 2020-10-24 15:25:24 +08:00
zhangqiang 0f4cd6d43e Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-24 14:15:45 +08:00
zhangqiang 7a4cd7ba8f 零售品升级升星红点 2020-10-24 14:15:35 +08:00
zhangqiang 291cddbb3f 灵兽提交 2020-10-23 19:10:00 +08:00
wangzhenxing 7072f53fab 合并冲突提交 2020-10-23 19:53:45 +09:00
wangzhenxing bfaed0d937 灵兽放生提交 2020-10-23 19:45:14 +09:00
jiaoyangna e9f42ce609 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua
2020-11-04 22:27:36 +08:00
jiaoyangna d49c1b97cb 灵兽羁绊提交 2020-11-04 22:25:59 +08:00
wangzhenxing 1466227510 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-23 09:55:02 +09:00
wangzhenxing 22a2789d08 灵兽涅槃提交 2020-10-23 09:54:49 +09:00
zhangqiang 7452d795e8 灵兽提交 2020-10-22 20:50:11 +08:00
zhangqiang 6d200caf1d 灵兽提交 战力改变 2020-10-22 18:32:11 +08:00
zhangqiang eb153fdaa6 灵兽提交 2020-10-22 16:13:44 +08:00
zhangqiang 0270d54e10 灵兽提交 2020-10-22 12:41:44 +08:00
zhangqiang 83088ea429 提交 2020-10-22 10:03:46 +08:00
wangzhenxing 02c55bcdb3 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-21 16:41:22 +09:00
wangzhenxing 80ebcccbbc 灵兽放生提交 2020-10-21 16:41:11 +09:00
zhangqiang f8d6c63368 灵兽提交 上阵提交 2020-10-21 11:58:16 +08:00
zhangqiang 3a6c14f607 灵兽提交 2020-10-20 20:18:02 +08:00
zhangqiang c6f34794f3 灵兽提交 2020-10-20 16:08:51 +08:00
zhangqiang e47a1d5a45 灵兽提交 2020-10-19 20:30:28 +08:00
zhangqiang 086292c67e 提交 2020-10-19 18:28:29 +08:00
zhangqiang 034230ffc9 提交 2020-10-19 16:57:30 +08:00
zhangqiang 92b2c3d6fb 提交 2020-10-19 10:56:55 +08:00
zhangqiang c6627d93e5 提交 2020-10-16 17:03:53 +08:00
zhangqiang 179242de4c 提交 2020-10-16 16:50:27 +08:00
zhangqiang b93d7d0435 提交 2020-10-15 15:43:35 +08:00
zhangqiang b37b584d68 提交 2020-10-14 17:10:36 +08:00
zhangqiang 49d2f4e347 添加界面 和表 2020-10-13 11:47:35 +08:00
zhangqiang 0a3f59befa 灵兽提交 2020-09-27 11:46:09 +08:00