yuanshuai
|
3b8317a897
|
逍遥游红点提交
|
2020-10-19 21:40:48 +08:00 |
yuanshuai
|
131d1aab1b
|
【逍遥游】红点和帮助弹窗提交
|
2020-10-19 21:39:48 +08:00 |
jiaoyangna
|
91778b2f77
|
【逍遥游】归元弹窗添加
|
2020-10-19 21:38:25 +08:00 |
gaoxin
|
ed26e9e758
|
公会副本刷新次数打印提交
|
2020-10-19 21:30:19 +08:00 |
ZhangBiao
|
1c955039ec
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-19 21:25:22 +08:00 |
ZhangBiao
|
e3bd86ef08
|
轩辕 修改 提交
(cherry picked from commit 27f8331e62 )
|
2020-10-19 21:25:12 +08:00 |
gaoxin
|
73063a72e3
|
【战斗0.0.4】代码遗漏补齐,
|
2020-10-19 21:06:01 +08:00 |
gaoxin
|
19135670ce
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2020-10-19 20:40:14 +08:00 |
gaoxin
|
364c9c99fc
|
【逍遥游】功能合并到local分支
|
2020-10-19 20:37:53 +08:00 |
ZhangBiao
|
cd782feb4d
|
Merge branch '0活动开发聚集地/竞技场界面修改' into master_xma_local
|
2020-10-19 20:14:31 +08:00 |
ZhangBiao
|
56f5856a71
|
宝箱个数减负
|
2020-10-19 20:10:53 +08:00 |
ZhangBiao
|
43201d2172
|
每日 赛季奖励 显示错误修复
|
2020-10-19 19:41:36 +08:00 |
ZhangBiao
|
b52ebf46f4
|
竞技场 bug修改
|
2020-10-19 19:34:48 +08:00 |
ZhangBiao
|
4c5065ccf7
|
竞技场界面修改
|
2020-10-19 18:52:36 +08:00 |
gaoxin
|
d33fe98ef1
|
【战斗0.0.4】修复战斗开始时偶现卡牌人物裁切显示错误的问题
|
2020-10-19 18:38:15 +08:00 |
gaoxin
|
05780afedb
|
【自动恢复物品】物品恢复机制改为前端计算
|
2020-10-19 18:37:59 +08:00 |
gaoxin
|
321aa22ec6
|
【战斗 0.0.3】尝试修复偶现战斗卡死得问题
|
2020-10-19 18:37:51 +08:00 |
ZhangBiao
|
e39706e312
|
遴选 社稷大典中对奖励界面的修改,到竞技场界面修改
|
2020-10-19 14:01:30 +08:00 |
ZhangBiao
|
09c3da664e
|
通用奖励界面 设计大典->竞技场界面修改
|
2020-10-19 13:54:08 +08:00 |
gaoxin
|
5dc4062a46
|
【战斗0.0.2】修复新增的被动技能非技能出发时报错的问题
|
2020-10-17 20:08:40 +08:00 |
gaoxin
|
6326a8ab9a
|
【战斗0.0.1-同步local】添加引导战斗暂停接口
|
2020-10-17 19:03:34 +08:00 |
gaoxin
|
0baed21bf6
|
战斗逻辑同步
|
2020-10-17 18:35:52 +08:00 |
gaoxin
|
3810fc2da1
|
修复关卡推送礼包报错的问题
|
2020-10-17 18:19:03 +08:00 |
gaoxin
|
5e7bcff321
|
【竞技场周任务减负-1】前端还没做,表提交错误处理
|
2020-10-17 16:50:32 +08:00 |
ZhangBiao
|
bae7d6550e
|
竞技场界面修改
|
2020-10-16 19:36:21 +08:00 |
ZhangBiao
|
0dbf805ef8
|
限时召唤 更换主Up神将
(cherry picked from commit 90a5c3f28d )
|
2020-10-23 17:38:45 +08:00 |
ZhangBiao
|
3b3a41c432
|
主题活动,势不可挡 霸哥修改
(cherry picked from commit dcf74880bc )
|
2020-10-23 17:38:33 +08:00 |
JieLing
|
386992eaa9
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-16 18:13:36 +08:00 |
ZhangBiao
|
9ac6eac395
|
礼包拍脸时机修复
|
2020-10-16 18:11:24 +08:00 |
ZhangBiao
|
4c55e3f1f0
|
推送礼包 special表id更改
|
2020-10-16 18:09:13 +08:00 |
ZhangBiao
|
8c4ff7e148
|
推送礼包 完事儿
|
2020-10-16 17:59:16 +08:00 |
jiaoyangna
|
435590808a
|
推送礼包修改
|
2020-10-16 17:59:00 +08:00 |
jiaoyangna
|
0fe316420a
|
推送礼包修改
|
2020-10-16 17:58:46 +08:00 |
ZhangBiao
|
f0e9063c97
|
关卡 和 心魔的推送礼包 后端还未剔除已购礼包信息,前端文字未修改
|
2020-10-16 17:56:39 +08:00 |
jiaoyangna
|
d340795646
|
主题活动修改 提交
|
2020-10-10 17:59:30 +08:00 |
jiaoyangna
|
9706c45942
|
主题活动修改
|
2020-10-10 16:15:27 +08:00 |
jiaoyangna
|
d51468cdca
|
势不可挡页签修改提交
|
2020-10-10 16:14:33 +08:00 |
jiaoyangna
|
aa9878a1f2
|
势不可挡 提交
|
2020-10-10 16:14:18 +08:00 |
jiaoyangna
|
8c5132185b
|
轩辕宝镜黑屏问题解决
|
2020-10-10 16:05:02 +08:00 |
gaoxin
|
8e3e25a450
|
修复无尽副本过渡期间依然可以进入的问题
|
2020-10-13 22:32:37 +08:00 |
jiaoyangna
|
f35bad0ee2
|
神州令跳转修改
|
2020-10-15 21:36:16 +08:00 |
jiaoyangna
|
14986fb3f5
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-15 21:30:32 +08:00 |
jiaoyangna
|
98c80ed67c
|
森罗幻境 修改
|
2020-10-15 21:26:56 +08:00 |
jiaoyangna
|
36559e89a7
|
【青龙秘宝】秘宝试炼页签下领取积分,升级时,青龙秘宝页签不会出现红点
|
2020-10-22 01:25:03 +08:00 |
jiaoyangna
|
72c09f393c
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-10-21 23:18:44 +08:00 |
jiaoyangna
|
97bb590c24
|
主题活动修改
|
2020-10-21 23:18:39 +08:00 |
JieLing
|
bff69e473d
|
招募玩家详情展示魂印有问题
|
2020-10-13 15:51:20 +08:00 |
JieLing
|
602c8e9e02
|
监听事件未移除正确
|
2020-10-12 20:44:15 +08:00 |
zhangqiang
|
fe8c903b31
|
限时升级活动打开后 退出一段时间再返回报错
|
2020-10-12 19:34:33 +08:00 |
jiaoyangna
|
2b6705f176
|
【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态
|
2020-10-12 17:13:44 +08:00 |