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 |
jiaoyangna
|
0a416d68d0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua
|
2020-08-24 17:46:31 +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 |
jiaoyangna
|
f484789ac5
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 17:36:22 +08:00 |
jiaoyangna
|
a162238af0
|
commit spine
|
2020-08-24 17:35:41 +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 |
ZhangBiao
|
ec6cf58003
|
天尊降世入口资源替换
|
2020-08-24 17:04:45 +08:00 |
JieLing
|
4496fa67a6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 16:56:52 +08:00 |
jiaoyangna
|
68e88e0f0d
|
commit spine
|
2020-08-24 16:49:20 +08:00 |
jiaoyangna
|
122c86444a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 16:44:11 +08:00 |
jiaoyangna
|
d1e4f04b21
|
spine commit
|
2020-08-24 16:43:48 +08:00 |
gaoxin
|
65aeee839d
|
战斗背景图修改
|
2020-08-24 16:34:35 +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 |
JieLing
|
e35c45a515
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-24 16:31:09 +08:00 |
zhangqiang
|
b36ebe510c
|
修改宝物分解
|
2020-08-24 16:29:27 +08:00 |
jiaoyangna
|
ecd7717cf1
|
commit spine
|
2020-08-24 16:26:05 +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 |
JieLing
|
b82e9ec3ef
|
jar包资源删除
|
2020-08-24 15:50:58 +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 |
jiaoyangna
|
dedeab993b
|
commit spine
|
2020-08-24 14:58:30 +08:00 |
jiaoyangna
|
3675b3e8a0
|
spine commit
|
2020-08-24 14:54:33 +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
|
ada573a8d0
|
00042 commit
|
2020-08-24 11:29:13 +08:00 |
jiaoyangna
|
78c3a0fcbd
|
spine commit
|
2020-08-24 11:23:52 +08:00 |
jiaoyangna
|
a58f779771
|
【送神祠】卡牌归元和分解 背景图片串了
|
2020-08-24 10:38:58 +08:00 |
jiaoyangna
|
7419c97899
|
限时折扣刷新update
|
2020-08-24 10:22:27 +08:00 |
jiaoyangna
|
0f90bbe3fb
|
副本预设修改
|
2020-08-24 10:07:16 +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 |
jiaoyangna
|
4b6fb01f41
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-22 20:26:35 +08:00 |
jiaoyangna
|
aebf37e150
|
云梦祈福提交
|
2020-08-22 20:26:11 +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 |
jiaoyangna
|
98e9b9757e
|
huodong commit
|
2020-08-29 13:46:08 +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
|
8391f5638f
|
破阵诛仙 通天教主替换资源
|
2020-08-22 10:20:41 +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 |
liujiaqi
|
1c577e94fe
|
法宝新资源
|
2020-08-21 14:56:38 +08: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 |
jiaoyangna
|
6c52db4ec6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-20 16:08:18 +08:00 |
jiaoyangna
|
2eaa10cdbc
|
添加红点
|
2020-08-20 16:08:12 +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
|
d1a4bff97e
|
chengjiu update
|
2020-08-19 20:10:48 +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 |
liujiaqi
|
87141ee852
|
新法宝资源
|
2020-08-19 14:23:59 +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 |