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 |
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
|
f3aca22b37
|
commit help_type
|
2020-08-25 11:38:23 +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
|
e0ab42e9c5
|
删除对files.unity3d的解密处理
|
2020-08-25 09:44:17 +08:00 |
JieLing
|
4aef89ab59
|
艺术字文件修改
|
2020-08-24 23:59:37 +08:00 |
JieLing
|
c14f7c4526
|
美元资源替换,艺术字体添加,
|
2020-08-24 23:58:33 +08:00 |
gaoxin
|
f373453cd2
|
修复主界面显示有缝隙的问题
|
2020-08-24 22:06:42 +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 |