JieLing
|
b1774c3853
|
累充界面金额转换为美元显示
|
2020-08-25 21:21:34 +08:00 |
JieLing
|
94a1aaea9f
|
修复部分界面艺术字体不显示显示的问题
|
2020-08-25 20:44:55 +08:00 |
JieLing
|
934b78e022
|
珍奇宝阁排序修改,198礼包放到最前面
|
2020-08-25 20:39:03 +08:00 |
JieLing
|
abd9e6b65a
|
好友切磋添加结果显示
|
2020-08-25 20:28:32 +08:00 |
JieLing
|
745150e59a
|
修复破阵诛仙界面销毁后,再次打开报错,显示异常的问题
|
2020-08-25 19:48:14 +08:00 |
JieLing
|
7c786a4573
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 19:26:58 +08:00 |
JieLing
|
b28309e14e
|
资源位置移动
|
2020-08-25 19:26:51 +08:00 |
zhangqiang
|
2ea0c63999
|
日常副本
|
2020-08-25 18:39:57 +08:00 |
ZhangBiao
|
d37af43f37
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 18:35:19 +08:00 |
ZhangBiao
|
617cb53270
|
森罗回春散星星、升级礼包调整
|
2020-08-25 18:35:04 +08:00 |
altair
|
ae760879c5
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 18:33:38 +08:00 |
altair
|
a8352e16e0
|
修改特效预设
|
2020-08-25 18:33:29 +08:00 |
zhangqiang
|
f223c0c3e1
|
副本修改
|
2020-08-25 18:24:17 +08:00 |
jiaoyangna
|
ca137cd5a5
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 18:17:20 +08:00 |
jiaoyangna
|
13d2a5f81a
|
装备宝物修改
|
2020-08-25 18:17:15 +08:00 |
JieLing
|
223234f582
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 18:00:42 +08:00 |
JieLing
|
5a89f52577
|
充值商品价格改为按配置显示
|
2020-08-25 17:59:34 +08:00 |
JieLing
|
2eeb381608
|
登陆界面资源替换
|
2020-08-25 17:56:55 +08:00 |
zhangqiang
|
060cc081bb
|
修改bug
|
2020-08-25 17:50:52 +08:00 |
ZhangBiao
|
e6946944b0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 17:31:16 +08:00 |
ZhangBiao
|
58aa9c2dce
|
每日豪礼 显示升级礼包 资源修改
|
2020-08-25 17:29:03 +08:00 |
JieLing
|
399f033bd6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 16:33:11 +08:00 |
JieLing
|
0da90f06a5
|
添加无敌吸血盾的判断
|
2020-08-25 16:33:04 +08:00 |
wangzhenxing
|
7d11f4b25f
|
还原之前死亡逻辑
|
2020-08-25 17:27:48 +09: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 |
JieLing
|
8e9e944279
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2020-08-25 16:18:27 +08:00 |
ZhangBiao
|
c6293a0566
|
月卡资源替换
|
2020-08-25 16:09:59 +08:00 |
wangzhenxing
|
6eaedb249d
|
解决 【ID1008832】
【技能】单独两个金翅大鹏,都触发了不灭,应该是先触发不灭的一方失败
|
2020-08-25 17:09:46 +09:00 |
jiaoyangna
|
9aceba1aa2
|
轩辕宝镜预设提交
|
2020-08-25 16:59:57 +08:00 |
JieLing
|
ff27e11daa
|
修复第五章会导致挂机界面卡死的问题
|
2020-08-25 16:06:06 +08:00 |
JieLing
|
f4292f1f08
|
无极青莲技能效果添加
|
2020-08-25 15:57:19 +08:00 |
JieLing
|
30cb8b37cf
|
登陆接口添加admin
|
2020-08-25 15:51:35 +08:00 |
JieLing
|
2ef85759a1
|
无敌盾,眩晕效果添加
|
2020-08-25 15:49:52 +08:00 |
zhangqiang
|
4d19e7ce98
|
中文表导出提交
|
2020-08-25 15:46:38 +08:00 |
zhangqiang
|
1efd100e31
|
奖励弹窗路径修改 公会副本选择框修改
|
2020-08-25 15:39:57 +08:00 |
zhangqiang
|
0ba113ddbc
|
首冲修改提交
|
2020-08-25 15:25:27 +08:00 |
zhangqiang
|
f0c1ad1b71
|
首冲
|
2020-08-25 15:09:53 +08:00 |
JieLing
|
34b2d555b6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 15:01:25 +08:00 |
JieLing
|
42a73022ac
|
连续充值背景体寒
|
2020-08-25 15:01:02 +08:00 |
zhangqiang
|
fe44f28958
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab
|
2020-08-25 14:49:13 +08:00 |
zhangqiang
|
77706e50cc
|
首冲有礼加特效
|
2020-08-25 14:46:57 +08:00 |
ZhangBiao
|
e3b872d31a
|
元-》$
|
2020-08-25 14:37:28 +08:00 |
ZhangBiao
|
1496c5e29a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 13:57:35 +08:00 |
ZhangBiao
|
6f6758bf14
|
元—>$的替换
|
2020-08-25 13:57:21 +08:00 |
JieLing
|
4a7917b6ef
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 11:53:57 +08:00 |
JieLing
|
6c1452fa51
|
创建角色界面资源修改,修复打包后引导消失的问题
|
2020-08-25 11:53:25 +08:00 |
jiaoyangna
|
bfc45c822e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 11:52:33 +08:00 |
jiaoyangna
|
62a0d2f41a
|
帮助位置修改
|
2020-08-25 11:52:27 +08:00 |
ZhangBiao
|
29457a4ea0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 11:43:06 +08:00 |