gaoxin
|
06e3fb5de7
|
国内版本支付参数上传
|
2020-08-24 17:56:55 +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 |
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 |