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 |
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 |
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
|
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 |
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 |
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 |
wangzhenxing
|
6eaedb249d
|
解决 【ID1008832】
【技能】单独两个金翅大鹏,都触发了不灭,应该是先触发不灭的一方失败
|
2020-08-25 17:09:46 +09:00 |
JieLing
|
ff27e11daa
|
修复第五章会导致挂机界面卡死的问题
|
2020-08-25 16:06:06 +08:00 |
JieLing
|
30cb8b37cf
|
登陆接口添加admin
|
2020-08-25 15:51:35 +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
|
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 |
zhangqiang
|
3a209ba629
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 16:31:34 +08:00 |
zhangqiang
|
b36ebe510c
|
修改宝物分解
|
2020-08-24 16:29:27 +08:00 |
wangzhenxing
|
ff791bb871
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 17:18:34 +09:00 |
wangzhenxing
|
46df2e7418
|
添加116效果
|
2020-08-24 17:16:43 +09:00 |
jiaoyangna
|
e67934ca50
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 16:08:50 +08:00 |
jiaoyangna
|
f05c6094b5
|
恭送英雄宝物修改提交
|
2020-08-24 16:08:03 +08:00 |
ZhangBiao
|
4b59561b3d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/BG/UI/MainScene/xuanwo_002.png.meta
|
2020-08-24 16:08:01 +08:00 |
ZhangBiao
|
6013365ad1
|
剑影仙踪特效更新
|
2020-08-24 16:07:08 +08:00 |
gaoxin
|
d7c34ec63d
|
创建角色界面立绘位置调整
|
2020-08-24 16:03:21 +08:00 |
gaoxin
|
85b5641162
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 15:46:11 +08:00 |
jiaoyangna
|
6e5cb7d922
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 15:41:03 +08:00 |
jiaoyangna
|
d7258b7fa5
|
一键装备提交
|
2020-08-24 15:40:58 +08:00 |
gaoxin
|
e806410e8a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2020-08-24 15:25:23 +08:00 |
ZhangBiao
|
36d96dcd84
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 15:20:13 +08:00 |
ZhangBiao
|
939fa0227a
|
无尽入口例会、化虚进入修复、剪影仙踪
|
2020-08-24 15:20:00 +08:00 |
jiaoyangna
|
7c069c390d
|
一键装备报错修改
|
2020-08-24 15:08:21 +08:00 |
gaoxin
|
2abfd842cf
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 15:01:26 +08:00 |
gaoxin
|
395c41ef79
|
Merge branch 'temp' into master_develop
|
2020-08-24 14:36:54 +08:00 |
gaoxin
|
74951cedd8
|
修复登录界面错误,修复战斗背景音乐缺失的问题
|
2020-08-24 14:35:45 +08:00 |
jiaoyangna
|
af58044b17
|
【宝物】宝物合成,合成预览和恭喜获得不一致
|
2020-08-24 14:31:44 +08:00 |
jiaoyangna
|
264bf8d4f0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 14:01:25 +08:00 |
jiaoyangna
|
80a7f569f7
|
qinglong commit
|
2020-08-24 14:00:15 +08:00 |
zhangqiang
|
1949d1148f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 13:59:22 +08:00 |
zhangqiang
|
6deae3c54c
|
公会副本次数修改 送神祠修改bug
|
2020-08-24 13:59:08 +08:00 |
jiaoyangna
|
a58f779771
|
【送神祠】卡牌归元和分解 背景图片串了
|
2020-08-24 10:38:58 +08:00 |
jiaoyangna
|
7419c97899
|
限时折扣刷新update
|
2020-08-24 10:22:27 +08:00 |
zhangqiang
|
351c811c67
|
添加副本红点检测位置
|
2020-08-24 09:48:13 +08:00 |
jiaoyangna
|
fb4d9e0d45
|
commit
|
2020-08-22 22:27:52 +08:00 |
zhangqiang
|
35899a49a4
|
公会副本调整 红点判断
|
2020-08-22 21:43:58 +08:00 |
jiaoyangna
|
cf0747566b
|
qinglong commit
|
2020-08-22 21:28:44 +08:00 |
jiaoyangna
|
4604d95f9d
|
qinglong commit
|
2020-08-22 21:20:12 +08:00 |
gaoxin
|
a5441aa4f4
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-22 21:04:09 +08:00 |
gaoxin
|
ba39d930b8
|
添加特权推送打印
|
2020-08-22 21:03:55 +08:00 |
jiaoyangna
|
887329a458
|
hondian
|
2020-08-22 20:57:19 +08:00 |
jiaoyangna
|
c10b4eec2d
|
jisu daren tijiao
|
2020-08-22 20:54:18 +08:00 |
gaoxin
|
1700c3bf80
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-22 20:50:59 +08:00 |
gaoxin
|
d17c99956d
|
修复破阵诛仙-累计充值奖励不显示的问题
|
2020-08-22 20:50:45 +08:00 |
jiaoyangna
|
a63f5e92d2
|
急速达人红点提交
|
2020-08-22 20:46:06 +08:00 |
zhangqiang
|
fe00d8726a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-22 20:25:28 +08:00 |
zhangqiang
|
028761ebaf
|
打开暴力输出
|
2020-08-22 20:25:12 +08:00 |
jiaoyangna
|
adff7af35a
|
qinglong commit
|
2020-08-22 20:22:30 +08:00 |
jiaoyangna
|
4477c38a25
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-22 19:40:19 +08:00 |
jiaoyangna
|
056815a8b6
|
patch commit
|
2020-08-22 19:40:14 +08:00 |
gaoxin
|
4f8026425d
|
sdk添加上传新手数据的接口
|
2020-08-22 19:14:58 +08:00 |
zhangqiang
|
ead1ba8fd9
|
提交
|
2020-08-22 19:08:50 +08:00 |
zhangqiang
|
44a2538eb3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
|
2020-08-22 18:06:08 +08:00 |
zhangqiang
|
8f72af20cc
|
公会副本提交 达人排行修改
|
2020-08-22 18:03:43 +08:00 |
jiaoyangna
|
dba4206ecc
|
eightday update
|
2020-08-22 17:43:19 +08:00 |
jiaoyangna
|
1622dcff32
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-22 17:37:04 +08:00 |
jiaoyangna
|
04bf990060
|
qinglong tijiao
|
2020-08-22 17:36:57 +08:00 |
ZhangBiao
|
be23f0c38a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-22 17:05:53 +08:00 |
ZhangBiao
|
8de86ce4ac
|
无尽副本入口
|
2020-08-22 17:05:37 +08:00 |
gaoxin
|
f2ae18778c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-22 17:02:48 +08:00 |
jiaoyangna
|
f814a80eb4
|
time update
|
2020-08-22 16:55:27 +08:00 |
jiaoyangna
|
c27d43ba2d
|
qinglong update
|
2020-08-22 16:49:12 +08:00 |
jiaoyangna
|
69a5b9b519
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
|
2020-08-22 16:46:17 +08:00 |
jiaoyangna
|
fa6bdeeb6a
|
huoqu huodongzhuangtai tijiao
|
2020-08-22 16:43:39 +08:00 |
gaoxin
|
af532fce6e
|
海外相关修改合并
|
2020-08-22 16:19:50 +08:00 |
jiaoyangna
|
3a16bedd0d
|
qinglong update
|
2020-08-22 15:48:01 +08:00 |
jiaoyangna
|
9395df5406
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-22 15:43:53 +08:00 |
jiaoyangna
|
f0f8a5d69e
|
qinglong update
|
2020-08-22 15:42:07 +08:00 |
zhangqiang
|
9aec7d16e8
|
公会副本提交
|
2020-08-22 15:34:02 +08:00 |
zhangqiang
|
e1b223e83f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# data_execl/base_data/ItemConfig.xlsx
# data_execl/base_data/MonsterConfig.xlsx
# data_execl/base_data/PrivilegeTypeConfig.xlsx
# data_execl/base_data/RewardGroup.xlsx
# data_execl/base_data/RewardItemConfig.xlsx
# data_execl/base_data/SpecialConfig.xlsx
# data_execl/base_data/StoreConfig.xlsx
# data_execl/base_data/UIConfig.xlsx
|
2020-08-22 13:59:35 +08:00 |
zhangqiang
|
b279baaa41
|
公会副本提交
|
2020-08-22 13:49:47 +08:00 |
ZhangBiao
|
7f0d404e5d
|
添加一键购买、礼包界面计时器销毁
|
2020-08-22 10:09:30 +08:00 |
ZhangBiao
|
1a826a3f3e
|
累计充值
|
2020-08-21 20:11:24 +08:00 |
zhangqiang
|
4ed5ba896a
|
公会副本号角
|
2020-08-21 19:09:33 +08:00 |
ZhangBiao
|
52dda5ff47
|
青龙入口 破阵长度
|
2020-08-21 19:03:41 +08:00 |
ZhangBiao
|
3530600553
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-21 18:56:12 +08:00 |
jiaoyangna
|
cbd8b9c084
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-28 18:33:09 +08:00 |
jiaoyangna
|
2646f9418a
|
|
2020-08-28 18:32:59 +08:00 |
jiaoyangna
|
7592690072
|
|
2020-08-28 18:07:50 +08:00 |
jiaoyangna
|
b9cc475e6d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-28 17:47:02 +08:00 |
jiaoyangna
|
8c17479fd6
|
破阵诛仙活动 调整
|
2020-08-28 17:46:07 +08:00 |
jiaoyangna
|
14e58ae443
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-28 16:37:01 +08:00 |
jiaoyangna
|
3bb8e284d9
|
破阵诛仙
|
2020-08-28 16:36:08 +08:00 |
jiaoyangna
|
66556e506a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-28 11:33:24 +08:00 |
jiaoyangna
|
22de98dc18
|
commit
|
2020-08-28 11:31:38 +08:00 |
jiaoyangna
|
e4a9c5c614
|
qinglong update
|
2020-08-28 11:05:31 +08:00 |
ZhangBiao
|
baaee2e547
|
|
2020-08-21 18:56:00 +08:00 |
ZhangBiao
|
bbe2c8c1f3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-21 18:30:50 +08:00 |
ZhangBiao
|
7058d73193
|
破阵诛仙 提交
|
2020-08-21 18:30:44 +08:00 |
zhangqiang
|
40bc0cef59
|
漏提
|
2020-08-21 18:24:16 +08:00 |
zhangqiang
|
0759809be9
|
公会副本提交
|
2020-08-21 18:22:53 +08:00 |
ZhangBiao
|
3e35b2bbff
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-21 16:39:47 +08:00 |
ZhangBiao
|
9e60a7eb1c
|
leijichonghzi data commit
|
2020-08-21 16:39:30 +08:00 |
zhangqiang
|
b725617a8d
|
公会副本提交
|
2020-08-21 15:52:49 +08:00 |
wangzhenxing
|
9a7b7c8eff
|
被动108 改为自身死亡后就不会反弹伤害
|
2020-08-21 15:59:34 +09:00 |
wangzhenxing
|
0f71f295d2
|
被动最佳技能添加类型判断,如果可以触发其他被动就赋成绝技类型,否是附加类型
|
2020-08-21 15:49:42 +09:00 |
ZhangBiao
|
54f285807b
|
代码调整
|
2020-08-21 14:42:36 +08:00 |
ZhangBiao
|
7ae97fdff0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-21 11:24:02 +08:00 |
ZhangBiao
|
b8a8a3980c
|
限时商市 珍奇宝阁
|
2020-08-21 11:23:46 +08:00 |
zhangqiang
|
c08c537b16
|
公会副本提交
|
2020-08-20 20:05:38 +08:00 |
ZhangBiao
|
aa551923b1
|
破阵诛仙 珍奇宝阁
|
2020-08-20 18:32:14 +08:00 |
wangzhenxing
|
dc77526a67
|
把死亡人数检测放到最后检测,防止有些有复活技能无法触发
|
2020-08-20 18:07:08 +09:00 |
jiaoyangna
|
948f47398c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-20 17:36:31 +08:00 |
jiaoyangna
|
6b0af3d7fb
|
pozhenzhuxian commit
|
2020-08-20 17:36:19 +08:00 |
wangzhenxing
|
9aec289306
|
添加新被动242,243 技能概率追加技能,击杀追加技能
|
2020-08-20 16:54:03 +09:00 |
ZhangBiao
|
b650ba81e8
|
界面顺序调整
(cherry picked from commit d47708cc41ecf75dd8aba813449c9e20e492b5e5)
|
2020-08-20 16:48:30 +08:00 |
ZhangBiao
|
4f43a2513a
|
Revert ""
This reverts commit 6be5ebd2cd .
|
2020-08-20 15:09:40 +08:00 |
ZhangBiao
|
6be5ebd2cd
|
|
2020-08-20 15:08:22 +08:00 |
ZhangBiao
|
b01a3f31f9
|
Merge branch '0副本/副本原版留存' into master_develop
# Conflicts:
# data_execl/base_data/MonsterConfig.xlsx
# data_execl/base_data/MonsterGroup.xlsx
|
2020-08-20 15:00:23 +08:00 |
ZhangBiao
|
17465d2f3d
|
|
2020-08-20 14:56:29 +08:00 |
ZhangBiao
|
e9b8083148
|
|
2020-08-20 14:43:48 +08:00 |
ZhangBiao
|
f93c57fd31
|
副本快结束啦!
|
2020-08-19 20:57:04 +08:00 |
jiaoyangna
|
785590bd4f
|
五星成长礼提交
|
2020-08-19 22:11:48 +08:00 |
jiaoyangna
|
fa1f5a7c35
|
五星成长礼提交
|
2020-08-19 22:03:47 +08:00 |
ZhangBiao
|
f9ffc1aa39
|
无尽细节修改
|
2020-08-19 19:37:59 +08:00 |
zhangqiang
|
869481a2cd
|
公会副本部分提交
|
2020-08-19 17:28:17 +08:00 |
ZhangBiao
|
32eadd13ef
|
试炼
|
2020-08-19 17:18:38 +08:00 |
jiaoyangna
|
60095d336d
|
qinglongserect commit
|
2020-08-19 14:12:42 +08:00 |
jiaoyangna
|
f439a78b34
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-19 10:05:09 +08:00 |
jiaoyangna
|
4e1236de8c
|
qinglongserecttreasure commit
|
2020-08-19 10:05:01 +08:00 |
ZhangBiao
|
7e4b73dc27
|
两个副本,基本成型了
|
2020-08-18 21:03:55 +08:00 |
zhangqiang
|
c6b0acb7d8
|
Merge branch 'master_develop' into 0功能/公会副本
# Conflicts:
# data_execl/base_data/MonsterConfig.xlsx
|
2020-08-18 19:36:17 +08:00 |
zhangqiang
|
00f1060be7
|
公会副本提交初始界面
|
2020-08-18 19:33:31 +08:00 |
ZhangBiao
|
f18973cea9
|
极速达人修改
|
2020-08-18 19:17:20 +08:00 |