Commit Graph

2745 Commits (6a1693939ce143814fedf635b3a0fb8643778cb9)
 

Author SHA1 Message Date
zhangqiang aa2db3e25e 【大闹天宫】 节点boss 站位错误 修复 2020-11-06 16:51:44 +08:00
zhangqiang 7121be9c04 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 16:49:18 +08:00
zhangqiang ac64980843 【易经宝库】 特效层级调整 2020-11-06 16:49:12 +08:00
jiaoyangna 6a95033b8b Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 16:39:45 +08:00
jiaoyangna cd99dd509b 立绘加载错误修改 2020-11-06 16:37:52 +08:00
zhangqiang 1a4349d93b 【觉醒】 界面提交 2020-11-06 16:23:02 +08:00
ZhangBiao fab6570a26 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 16:17:21 +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
jiaoyangna ccdba2b2df Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 16:11:47 +08:00
jiaoyangna 5251bc4059 [神将界面修改] 2020-11-06 16:11:37 +08:00
ZhangBiao 36759d8044 【易经宝库】增加稿子动效 2020-11-06 16:06:08 +08:00
zhangqiang 44350558c5 【巅峰赛】 头像特效设置层级有问题 线上 2020-11-06 15:49:08 +08:00
yuanshuai 327584750a 【逍遥游】预设修改提交 2020-11-06 15:48:59 +08:00
gaoxin 34617d419d 【资源】新增英雄icon资源位置移动 2020-11-06 15:48:21 +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
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
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 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
ZhangBiao 6f75850ae4 【易经宝库】提交 2020-11-05 19:10:20 +08:00
jiaoyangna ccf02fb171 【皮肤】添加倒计时 2020-11-05 18:26:38 +08:00
jiaoyangna 5026bdd0c3 【皮肤】提交 2020-11-05 16:02:49 +08:00
jiaoyangna 3bc2b74ce5 皮肤分解提交 2020-11-05 14:18:32 +08:00
ZhangBiao 476057bd1c 【易经宝库】主界面奖励显示 通用奖励界面创建 2020-11-04 19:51:58 +08:00
jiaoyangna 14812dab65 [皮肤]倒计时修改 2020-11-04 18:29:49 +08:00
jiaoyangna d7b9563e35 【皮肤】神将合成修改 2020-11-04 16:56:24 +08:00
jiaoyangna 360727419e 【皮肤】修改皮肤显示 2020-11-04 16:51:45 +08:00
jiaoyangna 6930561350 [皮肤]神将界面修改提交 2020-11-04 14:24:35 +08:00
jiaoyangna 644d984c0a 登陆报错修改 2020-11-04 14:24:08 +08:00
jiaoyangna b18b4cfd58 【皮肤】协议提交 2020-11-04 13:52:10 +08:00
jiaoyangna 79a5bcb74c 皮肤资源提交 2020-11-04 12:02:57 +08:00
jiaoyangna 4cb31d8f38 [皮肤]提交 2020-11-04 10:59:04 +08:00