jiaoyangna
|
a39bc32ef6
|
灵兽羁绊提交
|
2020-11-04 23:00:32 +08: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 |
wangzhenxing
|
c5b73fed7f
|
抽卡灵兽修改
|
2020-10-22 16:25:40 +09:00 |
wangzhenxing
|
b49c3f220d
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-10-22 16:15:57 +09:00 |
zhangqiang
|
eb153fdaa6
|
灵兽提交
|
2020-10-22 16:13:44 +08:00 |
wangzhenxing
|
e193bc2c21
|
灵兽抽卡剩余时间修改
|
2020-10-22 16:15:09 +09:00 |
wangzhenxing
|
1dbfab0029
|
灵兽抽卡显示修改
|
2020-10-22 16:07:38 +09:00 |
zhangqiang
|
0270d54e10
|
灵兽提交
|
2020-10-22 12:41:44 +08:00 |
zhangqiang
|
83088ea429
|
提交
|
2020-10-22 10:03:46 +08:00 |
wangzhenxing
|
11ccf2ab6f
|
灵兽分解预设提交
|
2020-10-21 17:25:12 +09: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
|
74858bdbe7
|
灵兽提交
|
2020-10-21 15:40:23 +08:00 |
zhangqiang
|
f8d6c63368
|
灵兽提交 上阵提交
|
2020-10-21 11:58:16 +08:00 |
zhangqiang
|
3a6c14f607
|
灵兽提交
|
2020-10-20 20:18:02 +08:00 |
wangzhenxing
|
ab4fa7925d
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-10-20 16:17:21 +09:00 |
zhangqiang
|
c6f34794f3
|
灵兽提交
|
2020-10-20 16:08:51 +08:00 |
wangzhenxing
|
4e047140a8
|
灵兽提交
|
2020-10-20 16:17:08 +09: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 |
wangzhenxing
|
84faff7246
|
Assets/ManagedResources/~Lua/Data/UIData.lua 合并冲突
|
2020-10-19 11:44:43 +09:00 |
zhangqiang
|
92b2c3d6fb
|
提交
|
2020-10-19 10:56:55 +08:00 |
wangzhenxing
|
5c6634d8d8
|
灵兽抽卡提交
|
2020-10-19 11:30:47 +09:00 |
wangzhenxing
|
711986c6a9
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-10-17 14:11:47 +09:00 |
wangzhenxing
|
bd4f93309f
|
灵兽涅槃,召唤,商店提交
|
2020-10-17 14:11:34 +09:00 |
zhangqiang
|
c6627d93e5
|
提交
|
2020-10-16 17:03:53 +08:00 |
zhangqiang
|
179242de4c
|
提交
|
2020-10-16 16:50:27 +08:00 |
zhangqiang
|
425023d697
|
提交
|
2020-10-15 20:52:15 +08:00 |
wangzhenxing
|
45be005e63
|
灵兽抽卡放生功能提交
|
2020-10-15 20:27:41 +09:00 |
zhangqiang
|
b93d7d0435
|
提交
|
2020-10-15 15:43:35 +08:00 |
zhangqiang
|
eaf610e9c2
|
提交
|
2020-10-14 19:41:33 +08:00 |
zhangqiang
|
b37b584d68
|
提交
|
2020-10-14 17:10:36 +08:00 |
wangzhenxing
|
aa82e7f13f
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-10-14 16:58:43 +09:00 |
wangzhenxing
|
be7ba4315a
|
抽卡活动添加灵兽类型
|
2020-10-14 16:58:28 +09:00 |
zhangqiang
|
c939bab156
|
提交
|
2020-10-13 19:14:34 +08:00 |
zhangqiang
|
f28501a893
|
提交
|
2020-10-13 16:32:50 +08:00 |
zhangqiang
|
bf2804f080
|
提交
|
2020-10-13 13:56:41 +08:00 |
zhangqiang
|
49d2f4e347
|
添加界面 和表
|
2020-10-13 11:47:35 +08:00 |
wangzhenxing
|
ed1d0e6150
|
灵兽修改提交
|
2020-09-29 16:13:06 +09:00 |
wangzhenxing
|
b7ecba8fab
|
合并冲突提交
|
2020-09-28 14:57:46 +09:00 |
wangzhenxing
|
663a54c9ed
|
language表提交
|
2020-09-28 14:54:15 +09:00 |
zhangqiang
|
cccab99a11
|
灵兽提交
|
2020-09-28 11:22:47 +08:00 |
zhangqiang
|
0a3f59befa
|
灵兽提交
|
2020-09-27 11:46:09 +08:00 |
zhangqiang
|
637d910b5c
|
灵 受
|
2020-09-25 18:41:07 +08:00 |