gaoxin
|
c325bf563f
|
Revert 回滚错误的合并 4f19f12612
|
2021-08-26 16:43:27 +08:00 |
ZhangBiao
|
bd7383f063
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-23 16:47:26 +08:00 |
jiaoyangna
|
ca656636ac
|
太初秘卷红点提交
(cherry picked from commit cbdcb66b07470bbc0662f04627503a175c097c8f)
|
2021-08-23 14:09:43 +08:00 |
ZhangBiao
|
2612c2e01e
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-08-17 19:53:05 +08:00 |
jiaoyangna
|
faf7591cf5
|
玲珑宝镜修改
|
2021-08-17 17:14:03 +08:00 |
ZhangBiao
|
edc728227c
|
【寻宝密宗】提交
|
2021-08-10 14:57:45 +08:00 |
ZhangBiao
|
ab0dece261
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
|
2021-08-06 11:32:10 +08:00 |
ZhangBiao
|
4edc9a855b
|
【寻宝迷踪】提交
|
2021-08-05 17:23:25 +08:00 |
zhangqiang
|
1e4b55d9fd
|
【修改协议请求】修改进入游戏会向后的发送更换 称号 皮肤 坐骑 请求
|
2021-08-04 17:53:30 +08:00 |
ZhangBiao
|
50cbd0ea50
|
【灵兽山】增加灵兽界面跳转
|
2021-08-04 16:58:19 +08:00 |
gaoxin
|
54448208df
|
【切磋】战斗界面重复打开容错添加
|
2021-08-02 15:33:50 +08:00 |
wangzhenxing
|
31c19def0a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 17:34:55 +08:00 |
wangzhenxing
|
d8801cae6c
|
[称号]=============添加罗浮争锋称号 获得 及 到时 后消息推送
|
2021-07-29 17:34:40 +08:00 |
zhangqiang
|
9c28f232f6
|
【跨服排行榜】
|
2021-07-29 16:35:58 +08:00 |
zhangqiang
|
9a2d9c70a7
|
【新功能】罗浮争锋排行榜增加跨服切磋功能
|
2021-07-28 15:48:35 +08:00 |
ZhangBiao
|
ffd0685d97
|
【任务跳转】未解锁灵兽山,灵兽招募任务前往提示活动未开启,应提示功能未解锁
【红点】车迟斗法的红点仍绑在副本入口处,而非公会按钮
|
2021-07-28 11:20:27 +08:00 |
zhangqiang
|
71f7e8a469
|
Merge branch 'china/dev' into china/jumpserver
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-07-27 11:26:30 +08:00 |
DESKTOP-98AVA47\Administrator
|
022681face
|
红点修改提交
|
2021-07-23 11:36:44 +08:00 |
zhangqiang
|
1cf142c82b
|
【跨服天梯】国内提交+1
|
2021-07-22 19:01:46 +08:00 |
zhangqiang
|
b395410ac1
|
Merge branch 'china/dev' into china/dev_c_跨服天梯
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2021-07-20 18:09:07 +08:00 |
jiaoyangna
|
acbdf46600
|
跳转 修改提交
|
2021-07-20 13:46:13 +08:00 |
DESKTOP-98AVA47\Administrator
|
8168d284f0
|
跳转提交
|
2021-07-20 10:20:41 +08:00 |
DESKTOP-98AVA47\Administrator
|
2f9a357023
|
跳转修改提交
|
2021-07-19 21:58:45 +08:00 |
jiaoyangna
|
61a2da78cd
|
超值基金跳转
|
2021-07-19 11:48:41 +08:00 |
DESKTOP-98AVA47\Administrator
|
36f04065fc
|
Merge branch 'china/dev' into 0优化/主题活动
# Conflicts:
# Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png
# Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png.meta
# Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png
# Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png.meta
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-07-15 12:59:20 +08:00 |
zhangqiang
|
6a3c48e0b8
|
【跨服天梯】国内提交+1
|
2021-07-14 21:43:03 +08:00 |
ZhangBiao
|
bc55cf3a19
|
Merge branch 'china/dev' into 0功能/山河试炼
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-07-14 18:08:46 +08:00 |
jiaoyangna
|
a8fd256812
|
ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
(cherry picked from commit 53e0f1adcc )
|
2021-07-14 16:59:59 +08:00 |
jiaoyangna
|
047c5c26f7
|
globaldefine冲突修改
|
2021-07-14 16:59:03 +08:00 |
jiaoyangna
|
53e0f1adcc
|
ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
|
2021-07-14 12:04:37 +08:00 |
ZhangBiao
|
c8b8a84d47
|
【山河试炼】差红点检测
|
2021-07-14 11:36:33 +08:00 |
jiaoyangna
|
9f4d456004
|
【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
|
2021-07-13 17:25:21 +08:00 |
jiaoyangna
|
1ead3c126d
|
抽卡红点提交
|
2021-07-10 14:56:28 +08:00 |
jiaoyangna
|
13905916d1
|
【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移
|
2021-07-06 16:48:59 +08:00 |
zhangqiang
|
fbda34d678
|
Merge branch 'china/dev' into china/dev_缥缈之旅
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
|
2021-07-03 16:53:42 +08:00 |
jiaoyangna
|
19247e296e
|
神将来源跳转修改提交
|
2021-07-02 11:23:07 +08:00 |
zhangqiang
|
a2528a3ded
|
【去掉无用打印】
|
2021-07-01 21:07:53 +08:00 |
zhangqiang
|
1be2dc60eb
|
【缥缈之旅】提交1
|
2021-07-01 20:13:47 +08:00 |
ZhangBiao
|
70b42de2ac
|
Merge branch 'china/dev' into 0活动开发聚集地/特惠神装
|
2021-07-01 20:09:56 +08:00 |
jiaoyangna
|
4f34d6ed42
|
神将来源返回时打开
|
2021-07-01 18:12:20 +08:00 |
ZhangBiao
|
53567ea586
|
【Log】清除带颜色的Log
|
2021-07-01 16:33:40 +08:00 |
zhangqiang
|
deb6eeca03
|
【跳转】增加惊喜礼盒跳转
|
2021-07-01 15:01:57 +08:00 |
jiaoyangna
|
a4281ed031
|
四元阵跳转修改
|
2021-06-30 16:07:37 +08:00 |
jiaoyangna
|
37b7071ccf
|
【ID1009590】
【神将信息】增加神将获取途径来源预览功能
|
2021-06-29 20:05:15 +08:00 |
jiaoyangna
|
1c89a4218c
|
假人骑牛修改
|
2021-06-23 11:05:53 +08:00 |
jiaoyangna
|
e5a491b7b9
|
随机人物修改提交
|
2021-06-23 10:20:03 +08:00 |
jiaoyangna
|
15361c2ef5
|
大圣跳转
|
2021-06-19 17:07:17 +08:00 |
jiaoyangna
|
e562176180
|
超凡入圣提交
|
2021-06-18 18:24:04 +08:00 |
gaoxin
|
a4fa7cacff
|
Revert "【山河试炼】差红点的检测"
This reverts commit 160a3e1a6f .
|
2021-06-16 10:08:41 +08:00 |
ZhangBiao
|
160a3e1a6f
|
【山河试炼】差红点的检测
|
2021-06-15 20:33:22 +08:00 |