gaoxin
|
3b83a72215
|
【本地化】文字还原
|
2021-01-26 11:05:27 +08:00 |
DESKTOP-98AVA47\Administrator
|
8f437f407d
|
【本周优化修改】
|
2021-01-15 22:11:38 +08:00 |
gaoxin
|
f501e92272
|
【本地化】代码还原,合并用
|
2021-01-12 11:00:44 +08:00 |
gaoxin
|
ae7da93056
|
【本地化】还原文字
|
2021-01-12 10:56:26 +08:00 |
ZhangBiao
|
1c78654a42
|
【ID1007750】【优化】青龙秘宝优化
(cherry picked from commit 02d655c394847de7f02bee6345b37988767d8f6e)
|
2021-01-12 10:14:18 +08:00 |
ZhangBiao
|
8cdbef0e70
|
【ID1007750】【优化】青龙秘宝优化
(cherry picked from commit fdcf53d59dbce0d6c7045dbdc81200a3335ccee9)
|
2021-01-12 10:14:09 +08:00 |
gaoxin
|
27b3c1ea32
|
【本地化】还原文本到代码中合并用
|
2021-01-09 14:20:06 +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 |
JieLing
|
e8ea367a6e
|
【优化】scrollview setData不是回到顶部时不再播放动画
|
2020-12-30 16:45:52 +08:00 |
gaoxin
|
9f691e4e05
|
【优化】scrollview分帧加载-游戏内适应性修改
|
2020-12-29 20:37:57 +08:00 |
ZhangBiao
|
c649621d85
|
【森罗幻境】下方头像顺序,后端把顺序换了
|
2020-12-28 15:19:46 +08:00 |
jiaoyangna
|
36559e89a7
|
【青龙秘宝】秘宝试炼页签下领取积分,升级时,青龙秘宝页签不会出现红点
|
2020-10-22 01:25:03 +08:00 |
JieLing
|
602c8e9e02
|
监听事件未移除正确
|
2020-10-12 20:44:15 +08:00 |
ZhangBiao
|
ff33dd07db
|
森罗回春散使用bug修改
(cherry picked from commit 62f185c859)
|
2020-10-12 15:15:02 +08:00 |
ZhangBiao
|
a47d882155
|
森罗回春散使用 问题修复
(cherry picked from commit 69fee1514f)
|
2020-10-12 15:14:27 +08:00 |
jiaoyangna
|
8b1012892f
|
青龙秘宝礼包状态修改
|
2020-10-15 16:31:53 +08:00 |
jiaoyangna
|
c6142a96f8
|
青龙秘宝等级界面时间销毁修改
|
2020-09-28 19:58:56 +08:00 |
JieLing
|
b7cd64f977
|
开服狂欢不可完成奖励修改,日常任务弹活动关闭异常
|
2020-09-28 14:11:00 +08:00 |
jiaoyangna
|
fc727e1061
|
时间销毁
|
2020-09-27 18:29:41 +08:00 |
JieLing
|
4c9db13851
|
修复青龙秘宝不关闭bug
|
2020-09-23 17:41:48 +08:00 |
jiaoyangna
|
dd8e9ab701
|
青龙秘宝入口修改
|
2020-09-22 17:46:44 +08:00 |
jiaoyangna
|
9540d87893
|
【青龙秘宝】达到最大等级还可以购买等级【青龙秘宝】周任务刷新后倒计时负数【青龙秘宝】活动结束入口不消失
|
2020-09-22 17:38:09 +08:00 |
ZhangBiao
|
e3e95e2379
|
森罗 无尽 流程优化和界面调整
|
2020-09-02 13:35:29 +08:00 |
jiaoyangna
|
e5bccae20b
|
【成就】点击任务,没有自动选择有红点的页签
|
2020-08-31 17:10:33 +08:00 |
jiaoyangna
|
ed758d3a37
|
五星拍脸
|
2020-08-31 16:50:15 +08:00 |
jiaoyangna
|
0ab3d69773
|
青龙秘宝试炼排序提交
|
2020-09-07 16:09:29 +08:00 |
jiaoyangna
|
4069c41f74
|
日常副本添加咸鱼积分奖励
|
2020-09-07 15:50:46 +08:00 |
ZhangBiao
|
021a7dc5a7
|
森罗换层卡死问题修复
|
2020-08-27 18:15:53 +08:00 |
jiaoyangna
|
cb69e474b9
|
qinglong task redpoint commit
|
2020-08-27 14:53:27 +08:00 |
jiaoyangna
|
9bc710ce58
|
qinglong commit
|
2020-10-01 00:05:54 +08:00 |
jiaoyangna
|
1b5c0e361a
|
qinglong commit
|
2020-08-26 23:14:51 +08:00 |
jiaoyangna
|
1cc497b2fd
|
qinglong commit
|
2020-08-26 20:30:52 +08:00 |
jiaoyangna
|
f28c176f18
|
add activity status
|
2020-08-26 20:17:37 +08:00 |
jiaoyangna
|
3c6a636d0d
|
qinglong commit
|
2020-08-26 20:04:36 +08:00 |
jiaoyangna
|
c2ec9c93f8
|
【秘宝试炼】周试炼刷新后时间显示负,青龙秘宝结束不关闭
|
2020-08-26 20:04:02 +08:00 |
jiaoyangna
|
f62a007edb
|
qinglong commit
|
2020-08-26 18:29:27 +08:00 |
jiaoyangna
|
4fd97151a5
|
qinglong commit
|
2020-08-26 17:13:27 +08:00 |
jiaoyangna
|
265f0f8781
|
qinglong commit
|
2020-08-26 17:08:04 +08:00 |
jiaoyangna
|
24b4852ea7
|
qinglong commit
|
2020-08-26 16:32:12 +08:00 |
jiaoyangna
|
e1a2a7cd52
|
qinglong commit
|
2020-08-26 16:15:52 +08:00 |
jiaoyangna
|
22fa2b0d4c
|
qinglong commit
|
2020-08-26 15:57:06 +08:00 |
jiaoyangna
|
66fb6f04d4
|
box update
|
2020-08-26 15:23:20 +08:00 |
jiaoyangna
|
1d3e961196
|
qinglong commit
|
2020-08-26 15:04:41 +08:00 |
jiaoyangna
|
7f9c8122c4
|
跳转修改提交
|
2020-08-26 14:51:10 +08:00 |
jiaoyangna
|
a52ea7f6b7
|
qinglong commit
|
2020-08-26 14:04:26 +08:00 |
jiaoyangna
|
d1ab290cf7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel.lua
|
2020-08-25 16:26:13 +08:00 |
jiaoyangna
|
87cc8867c7
|
宝物 commit
|
2020-08-25 16:23:41 +08:00 |
zhangqiang
|
4d19e7ce98
|
中文表导出提交
|
2020-08-25 15:46:38 +08:00 |
jiaoyangna
|
62a0d2f41a
|
帮助位置修改
|
2020-08-25 11:52:27 +08:00 |
jiaoyangna
|
8d69d04d09
|
添加帮助
|
2020-08-25 11:37:48 +08:00 |
jiaoyangna
|
8fb4e8cf13
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 11:22:05 +08:00 |
jiaoyangna
|
9ad0593572
|
qinglong redpoint commit
|
2020-08-25 11:21:42 +08:00 |
ZhangBiao
|
1382118441
|
成就点击进入是青龙 问题修复
|
2020-08-24 21:09:36 +08:00 |
jiaoyangna
|
ccb38eb3a7
|
qinglong commit
|
2020-08-24 20:10:52 +08:00 |
jiaoyangna
|
1a72381fad
|
qinglong update
|
2020-08-24 19:37:58 +08:00 |
jiaoyangna
|
80a7f569f7
|
qinglong commit
|
2020-08-24 14:00:15 +08:00 |
jiaoyangna
|
fb4d9e0d45
|
commit
|
2020-08-22 22:27:52 +08:00 |
jiaoyangna
|
adff7af35a
|
qinglong commit
|
2020-08-22 20:22:30 +08:00 |
jiaoyangna
|
056815a8b6
|
patch commit
|
2020-08-22 19:40:14 +08:00 |
jiaoyangna
|
04bf990060
|
qinglong tijiao
|
2020-08-22 17:36:57 +08:00 |
jiaoyangna
|
f814a80eb4
|
time update
|
2020-08-22 16:55:27 +08:00 |
jiaoyangna
|
c27d43ba2d
|
qinglong update
|
2020-08-22 16:49:12 +08:00 |
jiaoyangna
|
69a5b9b519
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
|
2020-08-22 16:46:17 +08:00 |
jiaoyangna
|
fa6bdeeb6a
|
huoqu huodongzhuangtai tijiao
|
2020-08-22 16:43:39 +08:00 |
jiaoyangna
|
3a16bedd0d
|
qinglong update
|
2020-08-22 15:48:01 +08:00 |
jiaoyangna
|
f0f8a5d69e
|
qinglong update
|
2020-08-22 15:42:07 +08:00 |
ZhangBiao
|
1a826a3f3e
|
累计充值
|
2020-08-21 20:11:24 +08:00 |
jiaoyangna
|
3bb8e284d9
|
破阵诛仙
|
2020-08-28 16:36:08 +08:00 |
jiaoyangna
|
e4a9c5c614
|
qinglong update
|
2020-08-28 11:05:31 +08:00 |
ZhangBiao
|
aa551923b1
|
破阵诛仙 珍奇宝阁
|
2020-08-20 18:32:14 +08:00 |
jiaoyangna
|
6b0af3d7fb
|
pozhenzhuxian commit
|
2020-08-20 17:36:19 +08:00 |
ZhangBiao
|
b01a3f31f9
|
Merge branch '0副本/副本原版留存' into master_develop
# Conflicts:
# data_execl/base_data/MonsterConfig.xlsx
# data_execl/base_data/MonsterGroup.xlsx
|
2020-08-20 15:00:23 +08:00 |
jiaoyangna
|
60095d336d
|
qinglongserect commit
|
2020-08-19 14:12:42 +08:00 |
jiaoyangna
|
4e1236de8c
|
qinglongserecttreasure commit
|
2020-08-19 10:05:01 +08:00 |
ZhangBiao
|
8f786147d3
|
|
2020-08-18 16:36:24 +08:00 |
ZhangBiao
|
c9cb029494
|
无尽副本基本功能
(cherry picked from commit 21f43fa1a132a469c1d674d12838148699998794)
|
2020-08-18 10:49:21 +08:00 |
ZhangBiao
|
b0f0b654ec
|
无尽副本已经可以进去了
(cherry picked from commit a1737d6e7014963b19c97ccfb2d1c878d88bc295)
|
2020-08-18 10:48:52 +08:00 |
jiaoyangna
|
e0359bb37a
|
encoding upate
|
2020-08-06 17:52:32 +08:00 |
jiaoyangna
|
1b2a752871
|
effect update
|
2020-07-30 16:37:58 +08:00 |
jiaoyangna
|
b6578e618e
|
effect update
|
2020-07-30 16:27:17 +08:00 |
jiaoyangna
|
d00afc69cf
|
添加特效
|
2020-08-06 15:14:47 +08:00 |
ZhangBiao
|
ddfbb25e2e
|
森罗bug修复
|
2020-07-28 16:45:28 +08:00 |
ZhangBiao
|
7b795f0daa
|
森罗bug
|
2020-07-23 19:05:43 +08:00 |
ZhangBiao
|
e0d156ad74
|
森罗英雄全部死亡战斗报错
|
2020-07-23 17:42:17 +08:00 |
ZhangBiao
|
9ed616d8be
|
|
2020-07-21 09:38:34 +08:00 |
2han9B1a0
|
f7c842eb9a
|
add zhushi
|
2020-07-03 17:59:10 +08:00 |
2han9B1a0
|
abfbfc423b
|
心魔文字修改、成长基金开启条件修改、文字:传说修改、四元阵卡池显示修改、自选宝箱提示修改
|
2020-07-03 11:27:25 +08:00 |
2han9B1a0
|
1796c48583
|
森罗幻境bug修改
|
2020-07-02 20:50:49 +08:00 |
JieLing
|
ab411b3d0d
|
svn逻辑同步
|
2020-07-02 17:04:46 +08:00 |
JieLing
|
461c64b04a
|
svn逻辑同步
|
2020-07-02 14:53:44 +08:00 |
JieLing
|
b3c70f66e4
|
svn逻辑tongbu
|
2020-07-01 18:14:03 +08:00 |
JieLing
|
c4751eed0a
|
svn逻辑同步
|
2020-07-01 10:54:39 +08:00 |
JieLing
|
5154fdbac0
|
外网0.16.14 内网0.15.25
|
2020-07-01 09:40:20 +08:00 |
JieLing
|
d08552ca2f
|
外网0.16.13 内网0.15.24
|
2020-06-30 18:59:44 +08:00 |
JieLing
|
8c61581548
|
外网 0.16.10 内网 0.15.23
|
2020-06-28 17:48:49 +08:00 |
JieLing
|
d87ab3767e
|
内网 0.15.20
|
2020-06-23 18:36:24 +08:00 |
JieLing
|
cf5f3e9952
|
内网测试 0.15.12
|
2020-06-13 11:47:13 +08:00 |
JieLing
|
90e12f1a4a
|
外网0.16.5,测试0.15.11
|
2020-06-08 20:18:49 +08:00 |
JieLing
|
b499b77bbe
|
外网0.16.4版本热更
|
2020-06-08 13:57:30 +08:00 |
JieLing
|
59db757cf9
|
六月三号开发提交
|
2020-06-03 19:09:01 +08:00 |