Commit Graph

464 Commits (89f8af19c4fa36c0640a24664f45aac9d7520ba9)

Author SHA1 Message Date
gaoxin 89f8af19c4 【主城】竖条改为初始打开 2021-12-31 01:53:05 +08:00
gaoxin 9c22dfc990 【提审】不再显示充值竖条,也不再触发相关引导 2021-12-30 23:28:55 +08:00
gaoxin 9a1350e8d3 【超值基金】语法错误 2021-12-21 18:27:15 +08:00
jiaoyangna 89fdc69afd 添加拍脸提交 2021-12-21 17:21:10 +08:00
ZhangBiao d189833b3f 【超值基金】提交 2021-12-21 11:35:56 +08:00
jiaoyangna 2c2d6a5e56 添加竞技试炼提交 2021-12-20 22:11:33 +08:00
jiaoyangna c6f99b2eab 竞技试炼修改提交 2021-12-20 22:05:18 +08:00
jiaoyangna b60d319083 竞技试炼修改提交 2021-12-20 22:03:08 +08:00
jiaoyangna a19e1d1b7d 返回主城打开竞技试炼 2021-12-20 21:59:33 +08:00
jiaoyangna ffd7d0ecbe 超值返利修改提交 2021-12-17 16:41:08 +08:00
jiaoyangna 50927b9ac5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-16 16:55:46 +08:00
jiaoyangna 1ae167efb5 至尊降世修改提交 2021-12-16 16:55:30 +08:00
gaoxin 969a22a768 【引导】修改引导天书密卷时主城场景的位置 2021-12-26 15:08:51 +08:00
jiaoyangna 11c4f914b5 至尊降世提交 2021-12-16 11:42:00 +08:00
jiaoyangna e33181dddb 招募秘宝提交 2021-12-10 13:41:03 +08:00
jiaoyangna 9b1ca0135c 【ID1010829】
增加开服竞技比拼活动——竞技试炼
2021-12-08 14:03:23 +08:00
ZhangBiao bc69e64b81 【连购礼包】提交 2021-12-02 16:27:24 +08:00
jiaoyangna 0d18d4595e 测试按钮关闭 2021-11-26 13:05:07 +08:00
jiaoyangna fd22b5a87f 天地洪炉提交 2021-11-25 18:55:20 +08:00
ZhangBiao ac768ff163 【常驻活动】提交 2021-11-24 18:14:25 +08:00
ZhangBiao 3b42cd525e 【三界降魔】新活动完成 2021-10-27 18:08:16 +08:00
gaoxin 7a5f41ef46 【积天豪礼】分离到主城 2021-11-10 00:58:39 +08:00
ZhangBiao 448ec131e8 Merge branch 'china/dev' into 0活动开发聚集地/百宝商会第二季
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-10-21 13:07:13 +08:00
ZhangBiao 3293656507 【新百宝商会】提交 2021-10-21 13:06:25 +08:00
ZhangBiao 1e3b3c9f27 【御剑行】修改提交 2021-10-20 18:31:59 +08:00
ZhangBiao f75e42d9c9 Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
2021-10-20 13:41:32 +08:00
jiaoyangna c091c55bef 【ID1010437】
【优化】开服玉帝御剑坐骑活动
2021-10-19 11:04:06 +08:00
ZhangBiao 6ebe5720a6 【御剑行】红点提交 2021-10-14 18:28:27 +08:00
ZhangBiao 3d1a5ebd4c 【御剑行】提交 2021-10-14 15:30:46 +08:00
ZhangBiao 9604225256 【御剑行】可以完成循环_提交 2021-10-12 17:21:46 +08:00
ZhangBiao 533bd25780 【御剑行】提交 2021-10-12 15:53:57 +08:00
ZhangBiao 359ca6b299 【御剑行】提交 2021-10-12 11:26:48 +08:00
ZhangBiao 99d80454f5 【御剑行】增加开始动画 2021-10-11 17:25:48 +08:00
ZhangBiao 294147b9ba 【御剑行】提交 2021-10-11 14:37:33 +08:00
ZhangBiao 422806200e 【御剑行】提交 2021-09-28 10:34:05 +08:00
jiaoyangna 5b7b607725 主城玲珑宝镜入口提交 2021-09-23 16:21:51 +08:00
gaoxin ec14782e3f 【红点】没删干净 2021-09-14 17:40:37 +08:00
gaoxin fcc1e17cad 【红点】无用红点绑定事件删除 2021-09-14 17:37:44 +08:00
gaoxin c19cfb3d49 【提审】关闭太初密卷显示 2021-08-28 15:26:35 +08:00
gaoxin 642ea1f7cd 【太初密卷】喜扑和动游渠道关闭 2021-08-25 07:25:38 +08:00
jiaoyangna 6ea8e96e59 太初秘卷红点修改提交
(cherry picked from commit c69a23be4ab0f01ab2dafe00ed1d9db3574e7314)
2021-08-23 14:34:08 +08:00
jiaoyangna 6a36e5ffd3 太初秘卷红点提交
(cherry picked from commit 8d99139640ed01e9ed692d0f74f2923dac24f839)
2021-08-23 14:27:49 +08:00
jiaoyangna 16ca4f84d6 太初秘卷红点修改提交
(cherry picked from commit b11e01a2972353c71d7c90c3a6443ded59892981)
2021-08-23 14:27:41 +08:00
jiaoyangna ca656636ac 太初秘卷红点提交
(cherry picked from commit cbdcb66b07470bbc0662f04627503a175c097c8f)
2021-08-23 14:09:43 +08:00
jiaoyangna 5c4696ad6c 太初秘卷修改提交 2021-08-12 17:32:34 +08:00
jiaoyangna a5af78f2c9 主城界面修改 2021-08-12 12:00:36 +08:00
jiaoyangna 792b533fa0 太初秘卷修改提交 2021-08-12 11:02:21 +08:00
jiaoyangna b83ee5e000 太初秘卷修改 2021-08-11 17:14:20 +08:00
jiaoyangna c3d45f1316 【ID1010059】
【新功能】太初密卷
2021-08-11 15:15:41 +08:00
zhangqiang 0de6e3f63a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-03 11:00:06 +08:00