jiaoyangna
|
8b7a227a54
|
【四灵试炼】预设提交
|
2020-12-08 17:01:53 +08:00 |
ZhangBiao
|
8a5d51e2a3
|
【灵兽抽卡】增加可选灵兽
(cherry picked from commit 8185be7c27 )
|
2020-11-13 12:12:44 +08:00 |
ZhangBiao
|
9ca403ebff
|
【易经宝库】第三层抽取完成后bug修复
|
2020-11-09 11:09:42 +08:00 |
ZhangBiao
|
5e130a7585
|
Merge branch '0活动开发聚集地/易经宝库' into master_xma_local
# Conflicts:
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials.meta
# Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
# Assets/ManagedResources/Effects/Model/Materials.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2020-11-06 16:17:12 +08:00 |
ZhangBiao
|
b516a8c202
|
【易经宝库】没有QA 无法购买
|
2020-11-06 13:36:48 +08:00 |
ZhangBiao
|
6f75850ae4
|
【易经宝库】提交
|
2020-11-05 19:10:20 +08:00 |
jiaoyangna
|
509357e333
|
Merge branch 'master_xma_local' into 0功能/皮肤
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2020-11-04 10:54:54 +08:00 |
jiaoyangna
|
e92e63444b
|
皮肤提交
|
2020-11-03 17:27:32 +08:00 |
zhangqiang
|
3479bd153c
|
【灵兽系统】 合并 功能ok 但是战斗合完进不去
|
2020-10-31 17:01:46 +08:00 |
ZhangBiao
|
0bf6e05add
|
【社稷大典】提交6
|
2020-10-24 18:58:07 +08:00 |
ZhangBiao
|
a62dc62ead
|
【社稷大典】提交
|
2020-10-24 18:20:43 +08:00 |
jiaoyangna
|
d39c078888
|
xiaoyao commit
|
2020-10-19 23:37:24 +08:00 |
ZhangBiao
|
2469c75f90
|
森罗幻境 炸弹使用描述修改
(cherry picked from commit 3b19043f34 )
(cherry picked from commit 677dca14e7 )
|
2020-10-13 14:01:47 +08:00 |
gaoxin
|
7afe25a5d2
|
界面适配修改,引导添加网络延时检测
|
2020-09-05 17:21:09 +08:00 |
ZhangBiao
|
e9e6378995
|
general_bomb 适配调整
|
2020-09-03 14:07:02 +08:00 |
gaoxin
|
13ab0dc54f
|
小弹窗界面屏幕适配修改
|
2020-09-02 10:29:55 +08:00 |
zhangqiang
|
e845bc5fe1
|
车迟 十绝阵 英雄详情 适配
|
2020-09-02 09:49:17 +08:00 |
zhangqiang
|
aabef68ccb
|
气泡提交
|
2020-09-01 11:50:24 +08:00 |
zhangqiang
|
40610b0c19
|
献祭修改
|
2020-08-31 18:19:38 +08:00 |
ZhangBiao
|
50dd63cd06
|
小游戏18按钮大小调整,前往下一层文字大小修改、
|
2020-08-31 16:06:57 +08:00 |
jiaoyangna
|
dd1493ee90
|
【碎片显示】确认购买和碎片合成时,不显示碎片道具的属性和碎片边框
|
2020-08-29 15:14:09 +08:00 |
gaoxin
|
c933276cea
|
试炼增益添加滑动效果
|
2020-08-28 00:24:06 +08:00 |
ZhangBiao
|
021a7dc5a7
|
森罗换层卡死问题修复
|
2020-08-27 18:15:53 +08:00 |
jiaoyangna
|
19465ac1b2
|
【宝物】共鸣界面等级上限显示不正确
|
2020-08-27 12:01:01 +08:00 |
gaoxin
|
46403f1431
|
创建角色界面显示优化
|
2020-08-26 18:17:43 +08:00 |
jiaoyangna
|
59204790d2
|
xuanyuan commit
|
2020-08-26 10:58:41 +08:00 |
ZhangBiao
|
617cb53270
|
森罗回春散星星、升级礼包调整
|
2020-08-25 18:35:04 +08:00 |
jiaoyangna
|
9aceba1aa2
|
轩辕宝镜预设提交
|
2020-08-25 16:59:57 +08:00 |
JieLing
|
6c1452fa51
|
创建角色界面资源修改,修复打包后引导消失的问题
|
2020-08-25 11:53:25 +08:00 |
jiaoyangna
|
ccb38eb3a7
|
qinglong commit
|
2020-08-24 20:10:52 +08: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
|
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
|
395c41ef79
|
Merge branch 'temp' into master_develop
|
2020-08-24 14:36:54 +08:00 |
jiaoyangna
|
4604d95f9d
|
qinglong commit
|
2020-08-22 21:20:12 +08:00 |
gaoxin
|
af532fce6e
|
海外相关修改合并
|
2020-08-22 16:19:50 +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
|
c08c537b16
|
公会副本提交
|
2020-08-20 20:05:38 +08:00 |
jiaoyangna
|
4e1236de8c
|
qinglongserecttreasure commit
|
2020-08-19 10:05:01 +08:00 |
zhangqiang
|
cdf78a9dcf
|
剑影仙踪资源提交
|
2020-08-17 15:59:33 +08:00 |
jiaoyangna
|
39fb3d113c
|
xuyuan commit
|
2020-08-12 21:10:27 +08:00 |
shihongyi
|
e797e9f48d
|
合并develop &2 进程中,暂时不要更新
|
2020-08-12 11:37:26 +08:00 |
ZhangBiao
|
879331e416
|
森罗炸弹数量刷新,奖励和generalpanel界面适配
|
2020-08-05 18:02:47 +08:00 |
zhangqiang
|
4533695a3d
|
法宝归元界面提交
|
2020-08-07 12:22:10 +08:00 |
jiaoyangna
|
89dbd09856
|
resolve hero tails update
|
2020-08-03 10:32:20 +08:00 |
jiaoyangna
|
7a0848100a
|
resolve hero tails update
|
2020-07-31 18:36:54 +08:00 |
ZhangBiao
|
6c316bf7de
|
|
2020-07-28 17:25:50 +08:00 |
ZhangBiao
|
1868a14b08
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 15:24:21 +08:00 |
ZhangBiao
|
52c34aa2a3
|
花费妖晶抽卡提示优化
|
2020-07-28 15:24:11 +08:00 |
jiaoyangna
|
99f9e7169e
|
添加特效
|
2020-07-28 15:06:47 +08:00 |
jiaoyangna
|
a688050060
|
修改星星提交
|
2020-07-25 14:21:33 +08:00 |
jiaoyangna
|
064b819f4a
|
修改星星提交
|
2020-07-24 20:03:06 +08:00 |
ZhangBiao
|
63b8b36a37
|
剔除logo等信息
|
2020-07-17 13:38:02 +08:00 |
ZhangBiao
|
cb56ec6b22
|
森罗小游戏bug修改
|
2020-07-16 16:59:46 +08:00 |
ZhangBiao
|
afa02aae2e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-16 13:45:50 +08:00 |
ZhangBiao
|
9d47ce9767
|
小游戏bug修复
|
2020-07-16 13:45:07 +08:00 |
jiaoyangna
|
adc3b71e40
|
分解修改提交
|
2020-07-16 10:49:01 +08:00 |
ZhangBiao
|
2ab6d17841
|
森罗小游戏修改
|
2020-07-14 21:03:44 +08:00 |
jiaoyangna
|
b2c9b88991
|
【装备】在成员信息界面,点击主线编队内的神将信息,穿戴的装备可以分解
|
2020-07-13 16:16:56 +08:00 |
jiaoyangna
|
0fb81547d3
|
分解提交
|
2020-07-11 16:21:15 +08:00 |
jiaoyangna
|
3a85c6e339
|
分解,限时召唤提交
|
2020-07-10 18:29:38 +08:00 |
zhangqiang
|
bff7df21e4
|
装备出售界面添加
|
2020-07-07 15:20:43 +08:00 |
zhangqiang
|
105d3bf53e
|
宝器分解计算掉落
|
2020-07-06 19:11:15 +08:00 |
zhangqiang
|
94a160d682
|
修改玩家信息时,应按照位置顺序显示该玩家主线阵容
|
2020-07-04 16:11:14 +08:00 |
zhangqiang
|
bc9dae0cff
|
漏提
|
2020-07-04 14:27:21 +08:00 |
JieLing
|
c4751eed0a
|
svn逻辑同步
|
2020-07-01 10:54:39 +08:00 |
JieLing
|
d08552ca2f
|
外网0.16.13 内网0.15.24
|
2020-06-30 18:59:44 +08:00 |
JieLing
|
8c61581548
|
外网 0.16.10 内网 0.15.23
|
2020-06-28 17:48:49 +08:00 |
JieLing
|
d87ab3767e
|
内网 0.15.20
|
2020-06-23 18:36:24 +08:00 |
JieLing
|
75a3f83194
|
内网0.15.16 外网 0.16.7
|
2020-06-19 20:19:35 +08:00 |
JieLing
|
7a410e1b60
|
内网测试 0.15.5
|
2020-06-19 16:18:05 +08:00 |
JieLing
|
e189462ac9
|
内网测试 0.15.14
|
2020-06-18 20:39:29 +08:00 |
JieLing
|
cf5f3e9952
|
内网测试 0.15.12
|
2020-06-13 11:47:13 +08:00 |
JieLing
|
2db43096de
|
补充提交
|
2020-06-12 18:04:22 +08:00 |
JieLing
|
90e12f1a4a
|
外网0.16.5,测试0.15.11
|
2020-06-08 20:18:49 +08:00 |
JieLing
|
b499b77bbe
|
外网0.16.4版本热更
|
2020-06-08 13:57:30 +08:00 |
JieLing
|
59db757cf9
|
六月三号开发提交
|
2020-06-03 19:09:01 +08:00 |
JieLing
|
063868ce73
|
外网包 0.16.1
|
2020-05-25 19:16:23 +08:00 |
JieLing
|
266b9065d8
|
测试版本 带热更 0.15.1
|
2020-05-15 16:52:35 +08:00 |
JieLing
|
4c8d2cf8de
|
提交
|
2020-05-09 13:31:21 +08:00 |