liujiaqi
|
02735594ba
|
血图标
|
2020-08-28 00:10:09 +08:00 |
jiaoyangna
|
8e5e508494
|
置换 commit
|
2020-08-28 00:09:07 +08:00 |
gaoxin
|
e6c8e81c82
|
修复小游戏反复打开会报错的问题
|
2020-08-27 23:01:07 +08:00 |
jiaoyangna
|
efd5a46eed
|
大闹天宫死亡置换修改提交
|
2020-08-27 22:52:51 +08:00 |
ZhangBiao
|
d87f14b479
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 22:25:19 +08:00 |
ZhangBiao
|
013bed75d7
|
|
2020-08-27 22:25:10 +08:00 |
jiaoyangna
|
7aff7b3c5c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 22:23:09 +08:00 |
jiaoyangna
|
80f59d54f1
|
置换编队检测还原
|
2020-08-27 22:23:04 +08:00 |
ZhangBiao
|
fbbe8db26f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua
|
2020-08-27 22:11:02 +08:00 |
ZhangBiao
|
4a452addd1
|
天宫秘宝报错修改
|
2020-08-27 22:10:08 +08:00 |
jiaoyangna
|
94e0dc10df
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 21:42:25 +08:00 |
jiaoyangna
|
010f44b1b0
|
commit zhihuan
|
2020-08-27 21:41:30 +08:00 |
gaoxin
|
a7fea145f6
|
修复日周月礼包不显示的问题
|
2020-08-27 21:40:01 +08:00 |
gaoxin
|
aea5077487
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 21:34:43 +08:00 |
gaoxin
|
b78d3e667e
|
每日充值金额显示不在计算差值
|
2020-08-27 21:34:38 +08:00 |
jiaoyangna
|
f2f3b77260
|
biandui update
|
2020-08-27 21:29:03 +08:00 |
jiaoyangna
|
f25bdb2d17
|
神将置换去掉检测编队
|
2020-08-27 21:17:47 +08:00 |
jiaoyangna
|
283ffca275
|
神将置换不检测无尽副本
|
2020-08-27 21:01:05 +08:00 |
jiaoyangna
|
d0d5da6adc
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 20:45:32 +08:00 |
jiaoyangna
|
3961935716
|
【神将置换】在大闹天宫编队中不需要提示已上阵,可以直接操作置换
|
2020-08-27 20:45:27 +08:00 |
altair
|
07bfcfe202
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 20:18:09 +08:00 |
altair
|
888078a2ef
|
替换技能文字图片资源
|
2020-08-27 20:17:25 +08:00 |
jiaoyangna
|
ff4d3e35c1
|
pozhenzhuxian redpoint update
|
2020-08-27 19:52:05 +08:00 |
jiaoyangna
|
9ed09dc1d2
|
tiangong serecttreasure commit
|
2020-08-27 19:41:51 +08:00 |
zhangqiang
|
fa3003fdc6
|
云梦祈福修改提交
|
2020-08-27 19:28:06 +08:00 |
gaoxin
|
51abf7d496
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 18:35:51 +08:00 |
gaoxin
|
82606d8fbe
|
每日周月礼包根据后端数据判断显隐
|
2020-08-27 18:35:32 +08:00 |
gongjiawei
|
b5559cdabc
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 18:32:17 +08:00 |
gongjiawei
|
8445b33d18
|
音频更新
|
2020-08-27 18:32:07 +08:00 |
ZhangBiao
|
a69ef6ca5c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 18:31:56 +08:00 |
ZhangBiao
|
2a2eac8cbb
|
森罗战斗失败两次弹出失败
|
2020-08-27 18:31:39 +08:00 |
jiaoyangna
|
227f5a9a38
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 18:24:44 +08:00 |
jiaoyangna
|
6aaa749852
|
activitydetail effect commit
|
2020-08-27 18:24:05 +08:00 |
ZhangBiao
|
82ec03a605
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 18:16:02 +08:00 |
ZhangBiao
|
021a7dc5a7
|
森罗换层卡死问题修复
|
2020-08-27 18:15:53 +08:00 |
gongjiawei
|
c8280b455c
|
音频更新
|
2020-08-27 18:02:15 +08:00 |
gongjiawei
|
cd340bb0fc
|
音频更新
|
2020-08-27 17:49:31 +08:00 |
gaoxin
|
1ce0e4b15c
|
战斗怒气文字修改
|
2020-08-27 17:26:55 +08:00 |
gaoxin
|
624781367b
|
只有技能音效加速
|
2020-08-27 17:07:59 +08:00 |
gaoxin
|
4daa2b7a39
|
关闭声音log
|
2020-08-27 17:02:34 +08:00 |
gaoxin
|
e62b745e1a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 17:02:00 +08:00 |
gaoxin
|
d79633c288
|
音效2倍速效果优化
|
2020-08-27 17:01:47 +08:00 |
zhangqiang
|
d452d76d05
|
显示活动选中修改 替换出包图片资源
|
2020-08-27 16:54:26 +08:00 |
altair
|
6fb7e80803
|
修改技能字
|
2020-08-27 16:50:52 +08:00 |
jiaoyangna
|
cb50189d13
|
处于传记页签时,切换后仍选中传记,但显示变为情报页签内容
|
2020-08-27 16:50:04 +08:00 |
jiaoyangna
|
a6382ff8d2
|
选中传记页签后,按钮变为“传说”
|
2020-08-27 16:44:25 +08:00 |
jiaoyangna
|
09f27f8d3d
|
des update
|
2020-08-27 16:16:08 +08:00 |
jiaoyangna
|
104311a51a
|
prefab commit
|
2020-08-27 16:07:03 +08:00 |
jiaoyangna
|
a350ec795d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 16:05:51 +08:00 |
jiaoyangna
|
ca618e9f33
|
add xuanyuan des
|
2020-08-27 16:05:46 +08:00 |
JieLing
|
25116f8cbe
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 15:26:33 +08:00 |
JieLing
|
77d66170bf
|
战斗音效播放速度变化添加
|
2020-08-27 15:26:25 +08:00 |
zhangqiang
|
fe3ff00677
|
增加魂印战力
|
2020-08-27 15:21:08 +08:00 |
ZhangBiao
|
114c910cd8
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 15:18:27 +08:00 |
ZhangBiao
|
52643c3937
|
大闹天宫入口开启修改
|
2020-08-27 15:18:17 +08:00 |
jiaoyangna
|
1c17724594
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 15:02:03 +08:00 |
jiaoyangna
|
cb69e474b9
|
qinglong task redpoint commit
|
2020-08-27 14:53:27 +08:00 |
JieLing
|
987ad6a325
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 14:29:21 +08:00 |
JieLing
|
78729f680d
|
修复公会界面监听事件错误,导致公会技能升级卡顿的问题
|
2020-08-27 14:29:14 +08:00 |
gongjiawei
|
1f1eeb4889
|
音频更新
|
2020-08-27 14:17:48 +08:00 |
ZhangBiao
|
1243629056
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 13:59:21 +08:00 |
ZhangBiao
|
811418e222
|
森罗 无尽红点
|
2020-08-27 13:59:14 +08:00 |
JieLing
|
4fcb0d3881
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 12:47:20 +08:00 |
zhangqiang
|
a2bd473d75
|
再次修改工会技能升级
|
2020-08-29 16:23:31 +08:00 |
zhangqiang
|
220a8f216e
|
大闹天宫背景 大闹天宫女例会比例 公会技能更新战力调整位置
|
2020-08-29 16:15:41 +08:00 |
JieLing
|
611bf1a91a
|
删除错误资源
|
2020-08-27 12:01:33 +08:00 |
jiaoyangna
|
8b27411fd8
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 12:01:07 +08:00 |
jiaoyangna
|
19465ac1b2
|
【宝物】共鸣界面等级上限显示不正确
|
2020-08-27 12:01:01 +08:00 |
jiaoyangna
|
a4b73c33b2
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-01 00:06:49 +08:00 |
jiaoyangna
|
2833c3a269
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-01 00:06:24 +08:00 |
jiaoyangna
|
9bc710ce58
|
qinglong commit
|
2020-10-01 00:05:54 +08:00 |
JieLing
|
4160f6d2a5
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-27 11:54:39 +08:00 |
liujiaqi
|
e3ce0b2c1b
|
小女孩剧情位置修改
|
2020-08-27 11:54:32 +08:00 |
zhangqiang
|
162180894b
|
车迟抢夺记录排续
|
2020-08-29 15:40:24 +08:00 |
JieLing
|
0f3b38f85e
|
修复主界面巅峰赛按钮时间显示错误的问题
|
2020-08-27 11:49:58 +08:00 |
liujiaqi
|
3effb209bb
|
新男女角色
|
2020-08-27 11:27:05 +08:00 |
zhangqiang
|
c315cf768d
|
竞技场排行
|
2020-08-27 10:52:35 +08:00 |
ZhangBiao
|
1e4f936810
|
无尽副本迷雾显示问题修改,无尽副本界面步数显示问题修复
|
2020-08-27 10:49:44 +08:00 |
zhangqiang
|
08a37d89d0
|
删除编队英雄去掉无尽副本判断
|
2020-08-27 09:40:25 +08:00 |
jiaoyangna
|
d43d4970e7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 23:14:58 +08:00 |
jiaoyangna
|
1b5c0e361a
|
qinglong commit
|
2020-08-26 23:14:51 +08:00 |
gaoxin
|
94612d54e4
|
剧情立绘替换
|
2020-08-26 23:10:03 +08:00 |
zhangqiang
|
47a16583ee
|
达人排行点击事件修复
|
2020-08-26 23:07:04 +08:00 |
gaoxin
|
db0a09ab68
|
修复副本界面通关后战斗力背景图标不关闭的问题
|
2020-08-26 22:37:31 +08:00 |
gaoxin
|
3dc8330e4b
|
修复连续点击导致战斗界面打开多次导致报错,立绘重叠的问题
|
2020-08-26 22:37:23 +08:00 |
zhangqiang
|
241a858968
|
首冲十星展示 法宝返回顺序修复
|
2020-08-26 22:15:23 +08:00 |
jiaoyangna
|
a7c7bd26ff
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 21:57:23 +08:00 |
jiaoyangna
|
50a40cc7b6
|
破阵诛仙修改
|
2020-08-26 21:57:10 +08:00 |
zhangqiang
|
7044422ebf
|
装备合成bug修复
|
2020-08-26 21:55:39 +08:00 |
jiaoyangna
|
9a0d461ada
|
jwel commit
|
2020-08-26 21:37:19 +08:00 |
jiaoyangna
|
1cdaf20d08
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 21:35:04 +08:00 |
jiaoyangna
|
a6e3ddcd7d
|
【宝物】精炼,弹服务器开小差
|
2020-08-26 21:34:48 +08:00 |
zhangqiang
|
012a01ec20
|
移动主界面虚化坛位置
|
2020-08-26 21:27:58 +08:00 |
zhangqiang
|
812450c032
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 20:56:48 +08:00 |
zhangqiang
|
6dec0b0307
|
修改公会技能升级 更新英雄战力
|
2020-08-26 20:56:28 +08:00 |
gaoxin
|
dbebfeddf7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 20:54:37 +08:00 |
gaoxin
|
ee71156c2c
|
修复背包界面装备战斗力不显示的问题
|
2020-08-26 20:53:56 +08:00 |
jiaoyangna
|
1482d308cb
|
日常副本修改
|
2020-08-26 20:37:31 +08:00 |
jiaoyangna
|
b987f3124a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 20:31:07 +08:00 |
jiaoyangna
|
1cc497b2fd
|
qinglong commit
|
2020-08-26 20:30:52 +08:00 |
gaoxin
|
8b0c138f68
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 20:20:53 +08:00 |
gaoxin
|
4b41b5def9
|
副本界面显示优化
|
2020-08-26 20:20:40 +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
|
03048116e4
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 20:04:13 +08:00 |
jiaoyangna
|
c2ec9c93f8
|
【秘宝试炼】周试炼刷新后时间显示负,青龙秘宝结束不关闭
|
2020-08-26 20:04:02 +08:00 |
zhangqiang
|
86361419cc
|
神将合成bug
|
2020-08-26 19:44:29 +08:00 |
ZhangBiao
|
f47dc8f441
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 19:08:31 +08:00 |
ZhangBiao
|
134b70ce33
|
成长礼包美元符号位置
|
2020-08-26 19:08:21 +08:00 |
gaoxin
|
a972b4993b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 18:33:57 +08:00 |
gaoxin
|
e834044de0
|
修复战斗最后一回合结束还会再打一次的问题
|
2020-08-26 18:33:47 +08:00 |
jiaoyangna
|
8a4f24ce77
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 18:29:35 +08:00 |
jiaoyangna
|
f62a007edb
|
qinglong commit
|
2020-08-26 18:29:27 +08:00 |
ZhangBiao
|
87891b2798
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 18:29:10 +08:00 |
ZhangBiao
|
42b0ffe95d
|
月基金价格修改
|
2020-08-26 18:29:02 +08:00 |
gaoxin
|
093c6d1f41
|
竞技场按钮功能未开启不再显示
|
2020-08-26 18:18:12 +08:00 |
gaoxin
|
46403f1431
|
创建角色界面显示优化
|
2020-08-26 18:17:43 +08:00 |
gaoxin
|
80e2f16169
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 17:58:51 +08:00 |
gaoxin
|
fcf0557f01
|
修复公会boss立绘会创建多次的问题
|
2020-08-26 17:58:46 +08:00 |
gaoxin
|
bab4148db6
|
主界面十绝阵,巅峰赛按钮添加
|
2020-08-26 17:58:23 +08:00 |
ZhangBiao
|
ed22b5b9d2
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 17:57:12 +08:00 |
ZhangBiao
|
8dd4feeead
|
乾坤宝囊特效增加
|
2020-08-26 17:56:59 +08:00 |
zhangqiang
|
730a39cd69
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 17:45:32 +08:00 |
zhangqiang
|
efaa3e51cc
|
公会副本刷新问题
|
2020-08-26 17:45:18 +08:00 |
ZhangBiao
|
ca6862831a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 17:22:03 +08:00 |
ZhangBiao
|
09c72dc362
|
神将界面点击前往化虚坛提示75级问题修改
|
2020-08-26 17:21:50 +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 |
ZhangBiao
|
1f35f84243
|
四元阵赠送20置换玉提示
|
2020-08-26 16:59:19 +08:00 |
zhangqiang
|
1b8f1631b7
|
巅峰战八强替换资源
|
2020-08-26 16:43:07 +08:00 |
jiaoyangna
|
d8d8dc5721
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 16:32:17 +08:00 |
jiaoyangna
|
24b4852ea7
|
qinglong commit
|
2020-08-26 16:32:12 +08:00 |
gaoxin
|
cafdcbcd40
|
聊天刷新时间延长为每5秒刷新一次
|
2020-08-26 16:29:52 +08:00 |
ZhangBiao
|
c5e245fca4
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 16:22:49 +08:00 |
ZhangBiao
|
dc9615b4fc
|
无尽进图武神将问题、取消对话战斗结束神将数据界面
|
2020-08-26 16:22:37 +08:00 |
jiaoyangna
|
e1a2a7cd52
|
qinglong commit
|
2020-08-26 16:15:52 +08:00 |
jiaoyangna
|
b3774c7a44
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 15:57:12 +08:00 |
jiaoyangna
|
22fa2b0d4c
|
qinglong commit
|
2020-08-26 15:57:06 +08:00 |
gaoxin
|
ec45a9688d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 15:51:41 +08:00 |
gaoxin
|
57a3c0ce37
|
首充引导10级开放
|
2020-08-26 15:51:36 +08:00 |
zhangqiang
|
64802afd2b
|
巅峰战编队提示bug提交
|
2020-08-26 15:47:01 +08:00 |
gaoxin
|
15f355b402
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 15:16:23 +08:00 |
gaoxin
|
9ff8dbf943
|
我要变强界面匹配当前版本修改
|
2020-08-26 15:16:17 +08:00 |
ZhangBiao
|
0db40d1c9b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 15:14:37 +08:00 |
ZhangBiao
|
d644b64450
|
删除限时活动中的五行成长礼,试炼副本治疗神将不能一键上阵
|
2020-08-26 15:14:27 +08:00 |
zhangqiang
|
d51276f132
|
公会副本提交
|
2020-08-26 15:10:33 +08:00 |
jiaoyangna
|
d17427269a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 15:04:52 +08:00 |
jiaoyangna
|
1d3e961196
|
qinglong commit
|
2020-08-26 15:04:41 +08:00 |
zhangqiang
|
384b3b35c3
|
编队修改
|
2020-08-26 15:00:13 +08:00 |
jiaoyangna
|
3deb27c862
|
跳转无尽副本修改
|
2020-08-26 14:53:31 +08:00 |
jiaoyangna
|
8d41c89eee
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 14:51:15 +08:00 |
jiaoyangna
|
7f9c8122c4
|
跳转修改提交
|
2020-08-26 14:51:10 +08:00 |
wangzhenxing
|
8a285e4227
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 15:24:54 +09:00 |
jiaoyangna
|
f8fc1da3b3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 15:23:26 +08:00 |
jiaoyangna
|
66fb6f04d4
|
box update
|
2020-08-26 15:23:20 +08:00 |
zhangqiang
|
63ce11cda4
|
替换底图
|
2020-08-26 15:18:44 +08:00 |
wangzhenxing
|
c9638f15e9
|
检测不灭效果还原
|
2020-08-26 15:24:37 +09:00 |
jiaoyangna
|
a52ea7f6b7
|
qinglong commit
|
2020-08-26 14:04:26 +08:00 |
JieLing
|
ad7bd17a38
|
修复八日登陆扫光错误的问题
|
2020-08-26 13:53:39 +08:00 |
JieLing
|
be1d62a888
|
修复登陆界面扫光显示错误的问题
|
2020-08-26 13:47:26 +08:00 |
JieLing
|
33538bdaa3
|
字体文件需要手动删除材质后再添加才会生效
|
2020-08-26 13:43:16 +08:00 |
gaoxin
|
6451739628
|
艺术字体文件修改
|
2020-08-26 13:37:16 +08:00 |
JieLing
|
c23947edcd
|
艺术字体优化
|
2020-08-26 13:35:33 +08:00 |
wangzhenxing
|
0a255a5c1f
|
选择对位英雄逻辑修改
|
2020-08-26 14:11:00 +09:00 |
gaoxin
|
d73b816bb3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 12:26:33 +08:00 |
gaoxin
|
b0222ccd61
|
艺术字体替换,美元显示优化
|
2020-08-26 12:26:19 +08:00 |
jiaoyangna
|
676fec2f81
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 12:23:26 +08:00 |
jiaoyangna
|
78ea78303d
|
日常 轩辕 列表优化
|
2020-08-26 12:23:10 +08:00 |
gaoxin
|
a4c5383917
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 11:41:26 +08:00 |
zhangqiang
|
4bc63fb367
|
编队bug
|
2020-08-26 11:26:32 +08:00 |
ZhangBiao
|
a86e5b6d4c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 11:19:58 +08:00 |
ZhangBiao
|
cc9c498c7d
|
云梦祈福刷新按钮、乾坤商店白片
|
2020-08-26 11:19:37 +08:00 |
gaoxin
|
fa787f83d5
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 11:11:27 +08:00 |
gaoxin
|
b175890bc3
|
累充活动金额处理
|
2020-08-26 11:11:14 +08:00 |
jiaoyangna
|
59204790d2
|
xuanyuan commit
|
2020-08-26 10:58:41 +08:00 |
jiaoyangna
|
03712f9069
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 10:19:00 +08:00 |
jiaoyangna
|
06abcb4ee3
|
宝物commit
|
2020-08-26 10:18:46 +08:00 |
ZhangBiao
|
c293aba881
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 10:18:38 +08:00 |
ZhangBiao
|
09ed357e08
|
森罗敌人信息显示界面空白问题修改
|
2020-08-26 10:18:31 +08:00 |
jiaoyangna
|
03ec954c9c
|
删除log
|
2020-08-26 10:16:16 +08:00 |
gaoxin
|
b8f87fa28f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 09:44:04 +08:00 |
zhangqiang
|
8eb1e19f85
|
公会副本时间
|
2020-08-26 09:40:32 +08:00 |
gaoxin
|
b7bf5e975a
|
删除白驹工作室
|
2020-08-26 09:40:03 +08:00 |
JieLing
|
fcc9a5eb2a
|
修复打开限时活动界面报错的问题
|
2020-08-25 21:55:13 +08:00 |
JieLing
|
1ac3dbb7f6
|
五星成长礼原价显示走表配置
|
2020-08-25 21:35:00 +08:00 |
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 |
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 |