jiaoyangna
|
8635a61e78
|
转盘,boss 修改
|
2020-10-17 13:48:38 +08:00 |
jiaoyangna
|
93218d9e62
|
时间返回修改
|
2020-10-17 13:37:54 +08: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 |
jiaoyangna
|
cb6e29076a
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-16 19:19:41 +08:00 |
jiaoyangna
|
0703ea4f45
|
逍遥提交
|
2020-10-16 19:19:37 +08:00 |
yuanshuai
|
f25854797e
|
逍遥游 资源脚本预设提交
|
2020-10-16 18:39:49 +08:00 |
jiaoyangna
|
6db6317da2
|
添加剩余时间接口
|
2020-10-16 18:01:29 +08:00 |
jiaoyangna
|
2a5a23f3ed
|
显示优化提交
|
2020-10-16 17:37:54 +08:00 |
zhangqiang
|
7d2016c812
|
加跳转
|
2020-10-16 17:13:14 +08:00 |
zhangqiang
|
c6627d93e5
|
提交
|
2020-10-16 17:03:53 +08:00 |
zhangqiang
|
179242de4c
|
提交
|
2020-10-16 16:50:27 +08:00 |
yuanshuai
|
7498b4dc01
|
脚本預設提交
|
2020-10-16 15:39:48 +08:00 |
yuanshuai
|
a441b04d91
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-16 15:04:40 +08:00 |
yuanshuai
|
4017b81bd3
|
逍遙游脚本於是提交
|
2020-10-16 15:04:31 +08:00 |
ZhangBiao
|
dcf74880bc
|
主题活动,势不可挡 霸哥修改
|
2020-10-16 13:58:51 +08:00 |
jiaoyangna
|
3c14447d17
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-16 10:33:00 +08:00 |
jiaoyangna
|
7b368e3cd9
|
数据报错修改
|
2020-10-16 10:32:50 +08:00 |
yuanshuai
|
2924f06560
|
协议提交
|
2020-10-16 10:25:57 +08:00 |
yuanshuai
|
5877c9e587
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-16 10:09:40 +08:00 |
jiaoyangna
|
e2ebe3ee18
|
逍遥游事件数据提交
|
2020-10-16 10:06:48 +08:00 |
yuanshuai
|
c54f19b3f1
|
逍遥游脚本
|
2020-10-16 10:06:10 +08:00 |
zhangqiang
|
425023d697
|
提交
|
2020-10-15 20:52:15 +08:00 |
jiaoyangna
|
63ea323a06
|
修改提交
|
2020-10-15 20:30:11 +08:00 |
jiaoyangna
|
6180692b3f
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
|
2020-10-15 19:42:44 +08:00 |
jiaoyangna
|
598ca9e91f
|
修改提交
|
2020-10-15 19:41:47 +08:00 |
yuanshuai
|
c954df27f4
|
逍遥游代码修改
|
2020-10-15 19:38:50 +08:00 |
yuanshuai
|
c3e8e60af2
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua
|
2020-10-15 19:31:46 +08:00 |
wangzhenxing
|
45be005e63
|
灵兽抽卡放生功能提交
|
2020-10-15 20:27:41 +09:00 |
yuanshuai
|
feb8aa2f9f
|
逍遥游脚本预设提交
|
2020-10-15 19:26:17 +08:00 |
jiaoyangna
|
c8a9f3f8db
|
逍遥游提交
|
2020-10-15 17:48:14 +08:00 |
jiaoyangna
|
e76b41d784
|
预设资源提交
|
2020-10-15 17:08:54 +08:00 |
jiaoyangna
|
7d485277aa
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2020-10-15 16:52:38 +08:00 |
jiaoyangna
|
7a86931564
|
转盘,招募提交
|
2020-10-15 16:50:56 +08:00 |
yuanshuai
|
a052877b1b
|
逍遥游功能完善
|
2020-10-15 16:30:51 +08:00 |
zhangqiang
|
b93d7d0435
|
提交
|
2020-10-15 15:43:35 +08:00 |
ZhangBiao
|
c65c0beeb9
|
社稷大典 排名奖励提交
|
2020-10-15 15:35:48 +08:00 |
yuanshuai
|
faff35373b
|
预设提交
|
2020-10-15 14:28:27 +08:00 |
jiaoyangna
|
f664ef0af5
|
Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
|
2020-10-15 14:17:36 +08:00 |
jiaoyangna
|
e12a075e2c
|
bosstij
|
2020-10-15 14:16:57 +08:00 |
gaoxin
|
aa72f7dd0d
|
修复活动刷新会导致引导报错的问题
|
2020-10-15 13:36:48 +08:00 |
yuanshuai
|
a9b9d9467f
|
掷骰子协议修改
|
2020-10-15 12:04:23 +08:00 |
yuanshuai
|
a05cb7cc43
|
协议修改
|
2020-10-15 11:53:03 +08:00 |
liujiaqi
|
b205951c26
|
社稷大典兑换道具图标资源
|
2020-10-14 20:19:58 +08:00 |
zhangqiang
|
eaf610e9c2
|
提交
|
2020-10-14 19:41:33 +08:00 |
ZhangBiao
|
2c708ed98d
|
限时活动 tabs调整
|
2020-10-14 17:56:08 +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 |
ZhangBiao
|
74b9f4ec3a
|
Merge branch 'master_develop' into 0活动开发聚集地/社稷大典
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
|
2020-10-14 14:39:04 +08:00 |