ZhangBiao
|
8185be7c27
|
【灵兽抽卡】增加可选灵兽
|
2020-11-13 12:12:06 +08:00 |
gaoxin
|
31378d1a76
|
【工具】刷新资源路径工具不再自动重命名
|
2020-11-13 11:30:50 +08:00 |
gaoxin
|
26cbfccf57
|
【工具】特效资源整理工具
|
2020-11-13 11:30:01 +08:00 |
wangzhenxing
|
bb4dfa322c
|
【技能】被动265修改
|
2020-11-13 12:22:33 +09:00 |
wangzhenxing
|
2ed9f538b3
|
[技能] 被动效果修改
|
2020-11-13 10:40:39 +09:00 |
wangzhenxing
|
a1315561e1
|
被动修改提交
|
2020-11-12 20:22:52 +09:00 |
gaoxin
|
8fe495cf88
|
【战斗】修复获取空的灵兽数据报错的问题
|
2020-11-12 19:42:31 +08:00 |
gaoxin
|
b606e5bb97
|
【音效】孙悟空普通攻击音效提交
|
2020-11-12 18:22:10 +08:00 |
gaoxin
|
ee9f3af6bb
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-12 18:12:33 +08:00 |
zhangqiang
|
33a40c700d
|
【献祭坛】 适配修改
|
2020-11-12 16:57:50 +08:00 |
zhangqiang
|
5da1841a03
|
【灵兽】灵兽上阵主界面名字颜色变化
|
2020-11-12 16:56:40 +08:00 |
gaoxin
|
ba30732766
|
【特效】再次修复孙悟空技能特效丢失的问题
|
2020-11-12 16:39:45 +08:00 |
gaoxin
|
86dd29629c
|
【忽略文件】忽略BattleRecord下的所有内容
|
2020-11-12 15:36:45 +08:00 |
gaoxin
|
93191b45b0
|
【资源】删除无用的灵兽合成界面背景资源
|
2020-11-12 15:34:56 +08:00 |
wangzhenxing
|
c4af6714bc
|
额外配置技能添加
|
2020-11-12 15:16:30 +09:00 |
gaoxin
|
ec8a14004a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-12 15:11:00 +08:00 |
gaoxin
|
db20230131
|
【战斗】假战斗加入对MonsterGroup配置的灵兽数据的处理
|
2020-11-12 15:10:53 +08:00 |
zhangqiang
|
a5f744261b
|
【觉醒】bug 修改 公会成员灵兽显示错误
|
2020-11-12 14:38:01 +08:00 |
zhangqiang
|
1615d0c2d2
|
【觉醒】问题修改
|
2020-11-12 13:55:15 +08:00 |
wangzhenxing
|
6a5a18eadd
|
被动描述修改提交
|
2020-11-12 11:31:25 +09:00 |
gaoxin
|
ea3be3e709
|
【本地化】修复代码本地化工具会重复导出包含转义字符的文本的问题
|
2020-11-12 10:47:25 +08:00 |
zhangqiang
|
e0c8ecfba8
|
Merge branch 'master_xma_local' into master_develop
# Conflicts:
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Prefab/Effect_c_swk_00015_s1_attack_PG_01.prefab
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Prefab/Effect_c_swk_00015_s1_attack_PG_02.prefab
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Prefab/Effect_c_swk_00015_s1_attack_PG_03.prefab
|
2020-11-11 20:33:41 +08:00 |
zhangqiang
|
82a2d14bb6
|
【觉醒】bug
|
2020-11-11 20:19:54 +08:00 |
zhangqiang
|
dcde0cf4ce
|
【灵兽提交】bug修改
|
2020-11-11 19:50:49 +08:00 |
zhangqiang
|
904b2dbe3a
|
【技能特效】 提交11.11
|
2020-11-11 17:00:04 +08:00 |
wangzhenxing
|
d54fb77bda
|
【战斗】新增觉醒被动效果
|
2020-11-11 16:38:37 +09:00 |
gaoxin
|
14bab99f0e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-11 15:31:10 +08:00 |
gaoxin
|
e6dec38b64
|
【本地化】添加一些测试代码
|
2020-11-11 15:31:05 +08:00 |
gaoxin
|
803372916e
|
【文档】添加更新流程文档
|
2020-11-11 11:53:35 +08:00 |
zhangqiang
|
f746575b10
|
Merge branch '0功能/神将觉醒' into master_develop
|
2020-11-11 11:38:43 +08:00 |
gaoxin
|
3ccb48a38c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-10 18:16:21 +08:00 |
gaoxin
|
710c077744
|
【version文件】新增商务服version文件
|
2020-11-10 18:15:52 +08:00 |
ZhangBiao
|
793bc58af8
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-10 16:47:00 +08:00 |
ZhangBiao
|
5a8d009f39
|
【易经宝库】漏题
(cherry picked from commit ebe03eff48)
(cherry picked from commit a2db78b1541b8ab9fc83bf53c7af2661c91216bb)
|
2020-11-10 16:46:54 +08:00 |
ZhangBiao
|
5a075c4fb5
|
【易经宝库】抽取灵兽报错修复
|
2020-11-10 16:27:31 +08:00 |
gaoxin
|
961f2a6955
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-10 15:43:19 +08:00 |
gaoxin
|
436fe6b1d5
|
【音频】白泽音频替换
|
2020-11-10 15:43:13 +08:00 |
gongjiawei
|
8a2dbd23be
|
音频更新
|
2020-11-10 15:36:41 +08:00 |
gongjiawei
|
55b629e576
|
白泽灵兽语音修改
|
2020-11-10 15:09:41 +08:00 |
liujiaqi
|
92ff0628c5
|
定卦神锄资源
|
2020-11-16 14:51:41 +08:00 |
gaoxin
|
5a6b83ebe6
|
Merge branch 'master_xma_local' into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Common/Language.lua
|
2020-11-10 10:41:02 +08:00 |
gaoxin
|
ab82dce46d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-11-10 10:25:00 +08:00 |
gaoxin
|
a7f51b5431
|
【音效】孙悟空技能音效添加
|
2020-11-10 10:24:42 +08:00 |
liujiaqi
|
89c73695e2
|
定卦神锄新图标上传
|
2020-11-15 17:31:15 +08:00 |
zhangqiang
|
10db1d34b3
|
【神将升级】 升星未卡住 and 神将合成报错
|
2020-11-10 10:17:42 +08:00 |
zhangqiang
|
d3283d8094
|
【神将升级】 太快优化
|
2020-11-09 16:29:22 +08:00 |
ZhangBiao
|
ed806f2707
|
【易经宝库】全部领完后 切换最终奖励点击奖池预览报错修复
(cherry picked from commit cfeabacca5df3645e1cf4f6e68558f15a3bfb025)
|
2020-11-09 16:11:13 +08:00 |
wangzhenxing
|
a09870522a
|
[皮肤]伤害统计界面添加皮肤显示
|
2020-11-09 15:52:43 +09:00 |
ZhangBiao
|
454a70668d
|
【易经宝库】格子点击位置不准确修复 曾加tips
|
2020-11-09 15:39:25 +08:00 |
zhangqiang
|
e72cac2afb
|
【逍遥游】 通关后返回问题修复
|
2020-11-09 15:25:02 +08:00 |