liujiaqi
|
d4ebf0767a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-04 11:40:21 +08:00 |
liujiaqi
|
66a7ad90f9
|
孙悟空东华帝君皮肤资源
|
2020-11-04 11:39:09 +08:00 |
zhangqiang
|
098ff3b2d6
|
【日常任务】 宝箱位置调整
|
2020-11-04 11:33:22 +08:00 |
jiaoyangna
|
4cb31d8f38
|
[皮肤]提交
|
2020-11-04 10:59:04 +08:00 |
zhangqiang
|
765c5b874a
|
【献祭坛】预设微调
|
2020-11-04 10:58:19 +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 |
ZhangBiao
|
7b943d6731
|
【特权商城】最后一分钟报错修改
|
2020-11-03 20:07:25 +08:00 |
jiaoyangna
|
1fcdf5b2a6
|
【皮肤】添加皮肤属性加成
|
2020-11-03 19:37:05 +08:00 |
zhangqiang
|
302e52aea5
|
【英雄合成】 添加提示
|
2020-11-03 19:19:37 +08:00 |
zhangqiang
|
3ae4ed1d41
|
【英雄合成】 添加提示
|
2020-11-03 19:19:13 +08:00 |
ZhangBiao
|
ab757a2543
|
【特权商城】最后一分钟报错修改
|
2020-11-03 19:10:32 +08:00 |
gaoxin
|
5a861ade95
|
【商店】前端从表里判断商品的显示状态添加
|
2020-11-03 18:01:31 +08:00 |
gaoxin
|
5070d78a79
|
【商店】前端从表里判断商品的显示状态添加
|
2020-11-03 18:00:53 +08:00 |
ZhangBiao
|
b31f5881ce
|
【特权商城】报错修改
|
2020-11-03 17:55:03 +08:00 |
ZhangBiao
|
e7b132952c
|
【特权商城】报错修改
|
2020-11-03 17:53:14 +08:00 |
jiaoyangna
|
e92e63444b
|
皮肤提交
|
2020-11-03 17:27:32 +08:00 |
gaoxin
|
e1625e6bed
|
【战斗】修复回合末释放的灵兽技能释放时界面显示已经到下一回合的问题
|
2020-11-03 17:17:46 +08:00 |
ZhangBiao
|
c3537b3486
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-03 17:05:15 +08:00 |
ZhangBiao
|
81e26c3128
|
【特权商城】增加 灵兽特权礼包 文字描述
|
2020-11-03 17:04:45 +08:00 |
wangzhenxing
|
3733d742bd
|
[灵兽] 灵兽奖池预览奖励顺序修改
|
2020-11-03 17:35:52 +09:00 |
ZhangBiao
|
d2da2c362d
|
【特权商城】增加 灵兽特权礼包 文字描述
|
2020-11-03 17:06:10 +08:00 |
gaoxin
|
5f1dde015e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-03 16:20:58 +08:00 |
gaoxin
|
6653ff59ff
|
【战斗】修复回合末释放的灵兽技能释放时界面显示已经到下一回合的问题
|
2020-11-03 16:20:41 +08:00 |
zhangqiang
|
1fee1f84eb
|
【灵兽系统】 召唤界面按钮文字位置
|
2020-11-03 16:11:06 +08:00 |
zhangqiang
|
47ea758d67
|
【灵兽系统】 羁绊预设微调
|
2020-11-03 16:11:00 +08:00 |
zhangqiang
|
0918acadd4
|
【灵兽系统】 羁绊预设微调
|
2020-11-03 16:10:45 +08:00 |
zhangqiang
|
0a8498b95e
|
【灵兽系统】 召唤界面按钮文字位置
|
2020-11-03 16:08:10 +08:00 |
gaoxin
|
49576b20ad
|
【战斗】修复战斗内名称不显示和我方元素显示错误的问题
|
2020-11-03 15:34:22 +08:00 |
gaoxin
|
23717d6fc9
|
【特权】修复获取特权次数会小于0的问题,解决急速探索会出现剩余次数为负数的问题
|
2020-11-03 15:34:12 +08:00 |
gaoxin
|
2dff35c3ff
|
【战斗】修复战斗内名称不显示和我方元素显示错误的问题
|
2020-11-03 15:26:29 +08:00 |
jiaoyangna
|
d040e4dded
|
神将界面结构修改
|
2020-11-03 15:17:48 +08:00 |
zhangqiang
|
812e6b8f0b
|
【灵兽系统】召唤界面 按钮位置有问题
|
2020-11-03 14:52:51 +08:00 |
zhangqiang
|
5d6db87650
|
【灵兽系统】召唤界面 按钮位置有问题
|
2020-11-03 14:51:58 +08:00 |
gaoxin
|
47029b0f0f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-03 14:20:22 +08:00 |
gaoxin
|
d4f57caa96
|
【特权】修复获取特权次数会小于0的问题,解决急速探索会出现剩余次数为负数的问题
|
2020-11-03 14:20:10 +08:00 |
zhangqiang
|
79aeb8720d
|
【灵兽系统】 按钮位置调整
|
2020-11-03 14:18:38 +08:00 |
gaoxin
|
8fe6bbb455
|
【资源】新增灵兽特权icon图标
|
2020-11-03 14:08:20 +08:00 |
wangzhenxing
|
18401c0663
|
合并PokemonSummonOneResultPanel.prefab
|
2020-11-03 14:19:09 +09:00 |
zhangqiang
|
f8b4befd3c
|
【灵兽系统】 按钮位置调整
|
2020-11-03 14:17:33 +08:00 |
gaoxin
|
9380675560
|
【资源】新增灵兽特权icon图标
|
2020-11-03 14:16:36 +08:00 |
wangzhenxing
|
5f518babce
|
[灵兽]灵兽奖励预览排序 抽卡再来一次字体位置修改
|
2020-11-03 14:18:02 +09:00 |
gaoxin
|
d00d3e803c
|
【商店】删除商店的动画显示
|
2020-11-03 01:00:58 +08:00 |
gaoxin
|
ba42282cc3
|
【战斗】修改会自己动的指定目标特效的显示时长
|
2020-11-03 01:00:53 +08:00 |
gaoxin
|
b634b81590
|
【商店】删除商店的动画显示
|
2020-11-03 01:00:27 +08:00 |
gaoxin
|
de861b5d9b
|
【战斗】修改会自己动的指定目标特效的显示时长
|
2020-11-02 23:53:12 +08:00 |
gaoxin
|
108e5b2568
|
【战斗】前摇特效添加指定位置释放的类型
|
2020-11-02 23:24:43 +08:00 |
gaoxin
|
10b2020170
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-02 23:20:07 +08:00 |
gaoxin
|
a3d849f421
|
【战斗】前摇特效添加指定位置释放的类型
|
2020-11-02 23:19:52 +08:00 |
zhangqiang
|
296d63ffbe
|
【灵兽系统】放生选择数量修改
|
2020-11-02 23:12:36 +08:00 |
zhangqiang
|
342a1bd373
|
【灵兽系统】 放生选择数量修改
|
2020-11-02 23:09:58 +08:00 |