jiaoyangna
|
c62a293740
|
结束修改
|
2021-05-14 16:02:14 +08:00 |
gaoxin
|
6b9cfdd6c2
|
【资源】新增物品资源
|
2021-05-14 15:54:28 +08:00 |
zhangqiang
|
57e1e32e32
|
【山河社稷图】提交
|
2021-05-14 15:03:48 +08:00 |
ZhangBiao
|
b3e40bac95
|
【修行】提交
|
2021-05-14 14:54:57 +08:00 |
ZhangBiao
|
410262cee8
|
Merge branch 'china/dev' into 0功能/修行玩法
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
|
2021-05-14 13:27:01 +08:00 |
ZhangBiao
|
3229d0693b
|
【修行】提交
|
2021-05-14 13:21:38 +08:00 |
jiaoyangna
|
fac4b21c6b
|
活动结束报错修改
|
2021-05-14 13:21:01 +08:00 |
jiaoyangna
|
3905116205
|
活动结束 修改提交
(cherry picked from commit 5018ba2d9b )
|
2021-05-14 13:14:12 +08:00 |
jiaoyangna
|
5018ba2d9b
|
活动结束 修改提交
|
2021-05-14 13:13:15 +08:00 |
gaoxin
|
519a12a214
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-14 10:36:57 +08:00 |
gaoxin
|
112f7b551d
|
【活动】所有tab图片都设置为正常大小
|
2021-05-14 10:36:51 +08:00 |
jiaoyangna
|
c855739dd6
|
嫦娥修改提交
|
2021-05-14 10:08:04 +08:00 |
jiaoyangna
|
0a18fd2c77
|
刷新修改
|
2021-05-14 09:59:11 +08:00 |
zhangqiang
|
364ce0526b
|
【山河社稷图】提交
|
2021-05-13 22:50:34 +08:00 |
jiaoyangna
|
acffbdc9e1
|
跳过按钮修改
|
2021-05-13 21:15:24 +08:00 |
jiaoyangna
|
4e05a30da5
|
活动界面点击点金 刷新
|
2021-05-13 21:06:45 +08:00 |
ZhangBiao
|
4b20254ddd
|
【修行】提交
|
2021-05-13 21:03:27 +08:00 |
jiaoyangna
|
d08e051590
|
神医天降任务重叠修改
|
2021-05-13 21:01:35 +08:00 |
jiaoyangna
|
bc1a22a1f9
|
跳转提交
|
2021-05-13 20:59:29 +08:00 |
jiaoyangna
|
1732d1e2db
|
红点变灰修改 剩余时间文字描述修改
|
2021-05-13 20:31:47 +08:00 |
zhangqiang
|
e4eda3017e
|
【山河社稷图】提交
|
2021-05-13 20:30:10 +08:00 |
jiaoyangna
|
138f3d2ff1
|
时间修改
|
2021-05-13 20:17:02 +08:00 |
jiaoyangna
|
2ed525a64d
|
限时兑换预设修改
|
2021-05-13 20:06:07 +08:00 |
jiaoyangna
|
22eeef86f3
|
灵兽特惠修改提交
|
2021-05-13 19:46:50 +08:00 |
jiaoyangna
|
401e90dd85
|
嫦娥修改提交
(cherry picked from commit 644d9d7d10 )
|
2021-05-13 19:27:26 +08:00 |
jiaoyangna
|
644d9d7d10
|
嫦娥修改提交
|
2021-05-13 19:26:23 +08:00 |
jiaoyangna
|
3b72644446
|
乾坤宝盒提交
|
2021-05-13 18:28:51 +08:00 |
jiaoyangna
|
b7dbc1919a
|
乾坤宝盒预设修改
|
2021-05-13 18:17:41 +08:00 |
jiaoyangna
|
de6d728dd4
|
乾坤宝盒描述修改
|
2021-05-13 18:04:35 +08:00 |
jiaoyangna
|
efdd57a103
|
修改描述
|
2021-05-13 18:00:35 +08:00 |
jiaoyangna
|
6393a76658
|
按钮修改
|
2021-05-13 17:57:19 +08:00 |
jiaoyangna
|
7e4287b701
|
删除查看祥情按钮
(cherry picked from commit e6582cf97f )
|
2021-05-13 17:55:45 +08:00 |
jiaoyangna
|
702a0202f7
|
主题活动任务修改
(cherry picked from commit f4c39cd6c1 )
|
2021-05-13 17:55:40 +08:00 |
jiaoyangna
|
e6582cf97f
|
删除查看祥情按钮
|
2021-05-13 17:54:45 +08:00 |
ZhangBiao
|
8df2338780
|
【修行】提交
|
2021-05-13 17:37:47 +08:00 |
jiaoyangna
|
f4c39cd6c1
|
主题活动任务修改
|
2021-05-13 17:05:55 +08:00 |
jiaoyangna
|
ac8eaf78bb
|
剧情音效提交
|
2021-05-13 16:32:40 +08:00 |
jiaoyangna
|
35d0f1337f
|
音效提交
|
2021-05-13 15:49:39 +08:00 |
jiaoyangna
|
99861a2235
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-13 14:51:55 +08:00 |
jiaoyangna
|
57497431d8
|
剧情怪物音效提交
|
2021-05-13 14:51:51 +08:00 |
gaoxin
|
84506a3141
|
【红包】取消红包发送后的tip提示
|
2021-05-13 14:22:27 +08:00 |
jiaoyangna
|
18ceb9c792
|
音频提交
|
2021-05-13 14:17:09 +08:00 |
jiaoyangna
|
ed41c4cf3c
|
成长礼包
|
2021-05-13 11:52:04 +08:00 |
wangzhenxing
|
b192d75b07
|
【战斗】=====被动去log
|
2021-05-13 11:34:25 +08:00 |
jiaoyangna
|
ec8c7ea645
|
成长礼包添加特效
|
2021-05-13 11:30:39 +08:00 |
wangzhenxing
|
501140fa52
|
[战斗]=========被动增加 316-321
|
2021-05-13 11:24:35 +08:00 |
jiaoyangna
|
6556a240e4
|
【活动优化】成长礼包banner替换及跳转增加流光特效
|
2021-05-13 10:53:12 +08:00 |
jiaoyangna
|
c4cf95921f
|
【活动优化】成长礼包banner替换及跳转增加流光特效
|
2021-05-13 10:50:38 +08:00 |
jiaoyangna
|
f2dd955ea8
|
【活动优化】成长礼包banner替换及跳转增加流光特效
|
2021-05-13 10:46:41 +08:00 |
zhangqiang
|
da33b98dfb
|
【山河社稷图】提交
|
2021-05-13 09:56:11 +08:00 |