gaoxin
|
6c1a801779
|
Merge remote-tracking branch 'origin/gx/test_new' into master_xma_local
|
2021-01-09 13:54:01 +08:00 |
gaoxin
|
b4713efce8
|
【GM】添加批量添加英雄,道具的GM
|
2021-01-09 13:53:48 +08:00 |
JieLing
|
55072e7094
|
【优化】数数创建角色时清空登录信息,
|
2021-01-09 13:51:43 +08:00 |
zhangqiang
|
ecd9a16ed1
|
【灵兽宝阁】再次收取提示修复
|
2021-01-08 19:40:36 +08:00 |
zhangqiang
|
43bd986273
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2021-01-08 19:31:36 +08:00 |
ZhangBiao
|
5bbd58c517
|
【公会援助】5点改12点文字修改
|
2021-01-08 19:30:29 +08:00 |
zhangqiang
|
d650e2f18c
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2021-01-08 19:25:31 +08:00 |
ZhangBiao
|
3dc7618b04
|
【车迟斗法】boss位置调整3
|
2021-01-08 19:25:13 +08:00 |
ZhangBiao
|
97141341db
|
【车迟斗法】boss位置调整2
|
2021-01-08 19:25:03 +08:00 |
ZhangBiao
|
bdab3b511d
|
【车迟斗法】boss位置调整
|
2021-01-08 19:24:56 +08:00 |
zhangqiang
|
d45aae1c64
|
【资源导入】灵兽宝阁 金乌文字
|
2021-01-08 19:24:46 +08:00 |
zhangqiang
|
f6c9456b8c
|
【资源导入】 灵兽 金乌 live2d and 三个音效
|
2021-01-08 19:24:00 +08:00 |
jiaoyangna
|
400376f7b7
|
【战斗回放】按钮显示修改
|
2021-01-08 19:23:53 +08:00 |
zhangqiang
|
bd14d812a3
|
【战斗回放】bug
|
2021-01-08 19:23:31 +08:00 |
jiaoyangna
|
b63c18ac53
|
【ID1007772】
【优化】91, 车迟斗法BOSS每日更换,掉落不同奖励
|
2021-01-08 19:23:23 +08:00 |
jiaoyangna
|
d7dfdfcb2e
|
铜墙铁壁
|
2021-01-08 19:23:09 +08:00 |
DESKTOP-98AVA47\Administrator
|
94f8e8c9f9
|
【送神祀】优化修改
|
2021-01-08 19:22:58 +08:00 |
zhangqiang
|
e12211eee4
|
【战斗回放】代码整理
|
2021-01-08 19:22:16 +08:00 |
zhangqiang
|
41ffad0c78
|
【战斗回放】车迟 十绝阵
|
2021-01-08 19:20:07 +08:00 |
zhangqiang
|
9f9b2920e3
|
【战斗回放】
|
2021-01-08 19:19:01 +08:00 |
ZhangBiao
|
657fe80519
|
【工会祭祀】提示文字 5点改0点
|
2021-01-08 19:16:48 +08:00 |
DESKTOP-98AVA47\Administrator
|
e3ffcb23b8
|
【(送神祠)选择属性筛选后进行恭送神将、神将归元、法宝归元、宝物分解优化】
|
2021-01-08 19:16:22 +08:00 |
zhangqiang
|
54ffbe55fc
|
【重置优化】将游戏中的各个玩法重置时间统一调整至0点
|
2021-01-08 19:15:08 +08:00 |
jiaoyangna
|
dc661f677f
|
【优化】91, 车迟斗法BOSS每日更换,掉落不同奖励
|
2021-01-08 19:15:01 +08:00 |
jiaoyangna
|
8a7e2ebcef
|
【优化】修改公会图腾功能
|
2021-01-08 19:14:40 +08:00 |
ZhangBiao
|
4a90f8838e
|
【降妖夺宝】取消抽卡前摇
(cherry picked from commit c84656e705 )
|
2021-01-08 19:08:55 +08:00 |
ZhangBiao
|
d09bc60b5e
|
【森罗幻境】红点刷新修改
|
2021-01-08 19:08:04 +08:00 |
ZhangBiao
|
554adfa3bc
|
【森罗幻境】红点刷新修改
(cherry picked from commit 31c5aa7580 )
|
2021-01-08 19:05:22 +08:00 |
JieLing
|
14f5a85577
|
【bug】删除显示活动按钮多余的判断
|
2021-01-07 18:30:32 +08:00 |
JieLing
|
6dea99ece5
|
Merge branch 'gx/test_new' of http://60.1.1.230/gaoxin/JL_Client into gx/test_new
|
2021-01-07 11:25:29 +08:00 |
Fuhaifeng
|
dc04060dd9
|
检测 重连后 和服务端的 确认消息 11700 11701
|
2021-01-06 20:57:59 +08:00 |
ZhangBiao
|
06ec0f40eb
|
【抽卡】降妖夺宝
|
2021-01-06 20:36:18 +08:00 |
ZhangBiao
|
b960e57716
|
【抽卡】降妖夺宝抽卡显示错误修改
|
2021-01-06 20:34:09 +08:00 |
Fuhaifeng
|
18642e01ae
|
LUA 中校验被提出的合理检查
|
2021-01-06 17:35:48 +08:00 |
ZhangBiao
|
524e502773
|
【0106抽卡修复】普通抽卡报错修复
(cherry picked from commit 254b22a75a893eaf9b1e792b83881e61f8e43d0f)
|
2021-01-06 14:00:13 +08:00 |
JieLing
|
c9ae0e833a
|
Merge branch 'master_xma_test' into gx/test_new
|
2021-01-05 18:12:37 +08:00 |
JieLing
|
3722a9a3f2
|
Merge branch 'master_xma_local' into master_xma_test
|
2021-01-05 16:33:42 +08:00 |
ZhangBiao
|
7cb9252f45
|
【礼包刷新】修复礼包刷新问题
|
2021-01-05 16:29:13 +08:00 |
JieLing
|
03cdc9cf55
|
Merge branch 'master_xma_test' into gx/test_new
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua
|
2021-01-05 14:23:00 +08:00 |
Fuhaifeng
|
3819ed162a
|
//确保 关闭Client的链接状态。
|
2021-01-04 19:41:01 +08:00 |
Fuhaifeng
|
fd7f19c8ec
|
偶尔出现的 同设备登录BUG, 通过SocketClient重新链接后的的安全甄别
|
2021-01-04 18:53:46 +08:00 |
JieLing
|
2c15faa4a4
|
【森罗】跳转
|
2021-01-04 18:29:41 +08:00 |
JieLing
|
b995971610
|
【森罗】跳转
|
2021-01-04 18:29:20 +08:00 |
JieLing
|
8c7c3f5cee
|
Merge branch 'master_xma_local' into master_xma_test
|
2021-01-04 18:14:16 +08:00 |
JieLing
|
cdd6f979c8
|
【狭路相逢】资源调整位置
|
2021-01-04 18:13:16 +08:00 |
ZhangBiao
|
70a85609df
|
【无尽副本】报错修改
(cherry picked from commit 43cfaf3d1054adca7f6284a0de38c2383678aa6e)
|
2021-01-04 17:00:24 +08:00 |
gaoxin
|
0a32818c92
|
Merge remote-tracking branch 'origin/0功能/1月6_版本优化' into master_xma_local
|
2021-01-04 16:57:31 +08:00 |
zhangqiang
|
33a7491279
|
【bug】
|
2021-01-04 16:47:04 +08:00 |
gaoxin
|
a13386674b
|
Merge remote-tracking branch 'origin/0功能/1月6_版本优化' into master_xma_local
|
2021-01-04 16:32:17 +08:00 |
ZhangBiao
|
71c18b1e94
|
狭路相逢
|
2021-01-04 15:52:13 +08:00 |