zhangqiang
|
1efd100e31
|
奖励弹窗路径修改 公会副本选择框修改
|
2020-08-25 15:39:57 +08:00 |
zhangqiang
|
0ba113ddbc
|
首冲修改提交
|
2020-08-25 15:25:27 +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 |
ZhangBiao
|
b34d02fa47
|
每日礼包一键购买按钮置灰
|
2020-08-25 11:42:55 +08:00 |
jiaoyangna
|
5c62cc19a7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 11:38:31 +08:00 |
jiaoyangna
|
8d69d04d09
|
添加帮助
|
2020-08-25 11:37:48 +08:00 |
ZhangBiao
|
e9fefa1ea1
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 11:25:54 +08:00 |
ZhangBiao
|
51672e6e9a
|
八日登陆资源替换
|
2020-08-25 11:25:41 +08:00 |
JieLing
|
593530d5d5
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 11:23:10 +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 |
zhangqiang
|
1ec1329fdf
|
公会副本入口提交
|
2020-08-25 11:18:20 +08:00 |
JieLing
|
661e5ba157
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 11:10:11 +08:00 |
zhangqiang
|
714545c75d
|
魂印效果图替换 修改公会副本
|
2020-08-25 10:40:13 +08:00 |
zhangqiang
|
9b2b85f6b5
|
关闭sdk数据打点,使用海外sdk时需打开
|
2020-08-25 10:21:31 +08:00 |
ZhangBiao
|
6f182e075a
|
天宫秘宝 解锁额外奖励文字提示修改,提示”置换玉不足“
|
2020-08-25 10:05:15 +08:00 |
JieLing
|
6a2ce4b305
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 09:44:23 +08:00 |
JieLing
|
c14f7c4526
|
美元资源替换,艺术字体添加,
|
2020-08-24 23:58:33 +08:00 |
ZhangBiao
|
7ed3549506
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 21:10:14 +08:00 |
ZhangBiao
|
1382118441
|
成就点击进入是青龙 问题修复
|
2020-08-24 21:09:36 +08:00 |
zhangqiang
|
a5c401bd34
|
提交
|
2020-08-24 20:55:03 +08:00 |
ZhangBiao
|
4a80694e19
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
|
2020-08-24 20:38:44 +08:00 |
ZhangBiao
|
d02a997cb0
|
天宫秘宝额外奖励界面
|
2020-08-24 20:37:41 +08:00 |
jiaoyangna
|
7ef2347d47
|
【破阵诛仙/超值基金】主城入口计时,够一天显示天,小于一天应该显示时分秒
|
2020-08-24 20:15:18 +08:00 |
jiaoyangna
|
ccb38eb3a7
|
qinglong commit
|
2020-08-24 20:10:52 +08:00 |
jiaoyangna
|
1ad1aaa2d4
|
qinglong update
|
2020-08-24 19:45:18 +08:00 |
jiaoyangna
|
1a72381fad
|
qinglong update
|
2020-08-24 19:37:58 +08:00 |
wangzhenxing
|
f007e185f8
|
116效果添加注释
|
2020-08-24 18:55:07 +09:00 |
ZhangBiao
|
b463deccca
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 18:51:29 +08:00 |
ZhangBiao
|
76f5a343eb
|
云梦祈福入口时间、青龙秘宝时间显示
|
2020-08-24 18:51:05 +08:00 |
zhangqiang
|
8f5d7c7783
|
副本修改
|
2020-08-24 18:41:14 +08:00 |
ZhangBiao
|
23ebaf5756
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 18:24:53 +08:00 |
ZhangBiao
|
52195c17ea
|
天宫秘宝标题修改
|
2020-08-24 18:24:42 +08:00 |
gaoxin
|
d21f6f215d
|
修复进入战斗报错的问题
|
2020-08-24 18:20:54 +08:00 |
gaoxin
|
06e3fb5de7
|
国内版本支付参数上传
|
2020-08-24 17:56:55 +08:00 |
gaoxin
|
0804789e68
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 17:43:33 +08:00 |
gaoxin
|
d4530f6ccf
|
修复新人物资源导致的报错
|
2020-08-24 17:43:28 +08:00 |
wangzhenxing
|
c38fdf9784
|
珍奇宝阁排序修改
|
2020-08-24 18:29:18 +09:00 |
gaoxin
|
b1f7318f11
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 17:18:36 +08:00 |
gaoxin
|
02c213aca8
|
挂机地图新增
|
2020-08-24 17:17:21 +08:00 |
jiaoyangna
|
68e88e0f0d
|
commit spine
|
2020-08-24 16:49:20 +08:00 |