yuanshuai
|
327584750a
|
【逍遥游】预设修改提交
|
2020-11-06 15:48:59 +08:00 |
gaoxin
|
34617d419d
|
【资源】新增英雄icon资源位置移动
|
2020-11-06 15:48:21 +08:00 |
wangzhenxing
|
d15c86b515
|
【皮肤】东华帝君 ,孙悟空技能特效修改提交
|
2020-11-06 16:38:04 +09:00 |
zhangqiang
|
39e8e1f894
|
【巅峰赛】 头像特效设置层级有问题 线上
|
2020-11-06 15:31:29 +08:00 |
yuanshuai
|
cb2bc989fa
|
【逍遥游】预设修改提交
|
2020-11-06 15:26:23 +08:00 |
gaoxin
|
6a1295f09a
|
【资源】新增英雄icon资源位置移动
|
2020-11-06 15:14:36 +08:00 |
ZhangBiao
|
b98490f233
|
【易经宝库】差一个稿子的动效
|
2020-11-06 15:11:19 +08:00 |
gaoxin
|
f1ca8398d3
|
【战斗】假战斗随机种子读表
|
2020-11-06 15:04:11 +08:00 |
wangzhenxing
|
4a6d8b393f
|
技能提交去除log
|
2020-11-06 15:04:05 +08:00 |
wangzhenxing
|
ab4f97fa0a
|
皮肤修改提交
|
2020-11-06 15:03:56 +08:00 |
gaoxin
|
c3422f1c8d
|
【资源】资源名重复修改
|
2020-11-06 15:02:46 +08:00 |
gaoxin
|
013ff84d34
|
【资源】孙悟空,东华帝君皮肤技能特效资源添加
|
2020-11-06 15:02:36 +08:00 |
jiaoyangna
|
767541c1a6
|
编队界面皮肤位置修改
|
2020-11-06 14:30:44 +08:00 |
gaoxin
|
30ac8733da
|
【战斗】假战斗随机种子读表
|
2020-11-06 14:15:03 +08:00 |
ZhangBiao
|
b516a8c202
|
【易经宝库】没有QA 无法购买
|
2020-11-06 13:36:48 +08:00 |
wangzhenxing
|
04fce03cd8
|
battlemanager修改提交
|
2020-11-06 13:32:04 +08:00 |
wangzhenxing
|
1123b38709
|
协议提交
|
2020-11-06 13:31:45 +08:00 |
wangzhenxing
|
3e917799bb
|
解决冲突提交
|
2020-11-06 13:31:30 +08:00 |
jiaoyangna
|
b7b4fb9d5d
|
meta 提交
|
2020-11-06 13:27:52 +08:00 |
wangzhenxing
|
ec5c6c512e
|
技能提交去除log
|
2020-11-06 14:01:38 +09:00 |
wangzhenxing
|
9621f9b220
|
皮肤修改提交
|
2020-11-06 14:00:04 +09:00 |
gaoxin
|
6ece165d2e
|
【资源】资源名重复修改
|
2020-11-06 13:34:49 +08:00 |
gaoxin
|
3bf68bfbd8
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-06 12:11:49 +08:00 |
gaoxin
|
cd51c7bfc5
|
【资源】孙悟空,东华帝君皮肤技能特效资源添加
|
2020-11-06 12:11:36 +08:00 |
gaoxin
|
a4ce1b6438
|
【音频】重复音频资源删除
|
2020-11-06 12:09:04 +08:00 |
wangzhenxing
|
89f33a7fa0
|
battlemanager修改提交
|
2020-11-06 12:05:34 +08:00 |
wangzhenxing
|
3d7d32ac12
|
协议提交
|
2020-11-06 12:04:04 +08:00 |
wangzhenxing
|
3bdbea5e22
|
解决冲突提交
|
2020-11-06 12:01:17 +08:00 |
gaoxin
|
f3690d5c03
|
Merge branch 'master_xma_local' into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/GMPanel.prefab
|
2020-11-06 11:47:13 +08:00 |
gaoxin
|
8b21b4f9af
|
Merge branch 'master_xma_local' into master_develop
|
2020-11-06 11:45:38 +08:00 |
gaoxin
|
927f2280e8
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-06 11:41:49 +08:00 |
gaoxin
|
857f97f2ab
|
【战斗】假战斗数据组建错误修复
|
2020-11-06 11:41:40 +08:00 |
liujiaqi
|
b637d17a9b
|
孙悟空东华帝君皮肤资源
|
2020-11-06 11:21:29 +08:00 |
gaoxin
|
d668e4ffc3
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
|
2020-11-06 11:19:46 +08:00 |
gaoxin
|
1ac0e6fc53
|
【战斗】添加新的假战斗功能
|
2020-11-06 11:18:09 +08:00 |
zhangqiang
|
3ae2d1048e
|
【GM】gm工具优化
|
2020-11-06 11:16:24 +08:00 |
jiaoyangna
|
be7be732d3
|
Merge branch 'master_develop' into 0功能/皮肤
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
|
2020-11-06 10:54:04 +08:00 |
jiaoyangna
|
a109c2f93f
|
【皮肤】 战斗提交
|
2020-11-06 10:51:41 +08:00 |
jiaoyangna
|
e8be02de87
|
[移山倒海] 提交
|
2020-11-06 10:49:08 +08:00 |
jiaoyangna
|
beec28a8b8
|
Merge branch 'master_xma_local' into 0功能/皮肤
|
2020-11-06 10:34:22 +08:00 |
zhangqiang
|
ea24696722
|
【逍遥游】新增地图 xbhz
|
2020-11-06 10:15:06 +08:00 |
jiaoyangna
|
e2fae0cc52
|
皮肤提交
|
2020-11-06 09:37:27 +08:00 |
zhangqiang
|
6488dad50a
|
【献祭坛】 资源适配替换
|
2020-11-05 20:08:46 +08:00 |
ZhangBiao
|
6f75850ae4
|
【易经宝库】提交
|
2020-11-05 19:10:20 +08:00 |
jiaoyangna
|
ccf02fb171
|
【皮肤】添加倒计时
|
2020-11-05 18:26:38 +08:00 |
gongjiawei
|
8efb5a5c64
|
音频更新
|
2020-11-05 18:22:32 +08:00 |
zhangqiang
|
11a059e1ec
|
【音效】灵兽技能音效替换
|
2020-11-05 17:37:29 +08:00 |
zhangqiang
|
105843f939
|
【巅峰赛】 排错 临时修改 ~~~~~~~~~~~~~
|
2020-11-05 17:23:29 +08:00 |
zhangqiang
|
4f0d2626b5
|
【大闹天宫】 新增需求 增加圣物 新标 提示
|
2020-11-05 17:04:38 +08:00 |
zhangqiang
|
3a7ff72e45
|
【特权商城】 前端加等级限制 有表!!!
|
2020-11-05 16:44:58 +08:00 |