Commit Graph

3769 Commits (86dd29629c4756c7d61b59f1b4b43ae5a7ffe11d)
 

Author SHA1 Message Date
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
gaoxin 0887de50d5 【特效】孙悟空普通攻击受击特效材质丢失修复 2020-11-11 20:13:01 +08:00
gaoxin 740cfa0e20 【特效】孙悟空技能特效材质丢失修复 2020-11-11 20:00:12 +08:00
zhangqiang dcde0cf4ce 【灵兽提交】bug修改 2020-11-11 19:50:49 +08:00
gaoxin 74b6294c2a 【特效】孙悟空皮肤技能特效修改 2020-11-11 19:39:55 +08:00
zhangqiang 36f8d28974 【孙悟空技能】普工特效添加 2020-11-11 18:33:06 +08:00
gaoxin 4f635cf42d 【战斗】修复特效层级显示错误 2020-11-11 18:10:06 +08:00
zhangqiang 904b2dbe3a 【技能特效】 提交11.11 2020-11-11 17:00:04 +08:00
gaoxin a65c528256 【GM】战斗种子数据类型错误 2020-11-11 16:10:21 +08:00
gaoxin a3d6f49e15 【gm】修复战斗数据gm报错的问题 2020-11-11 16:04:01 +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
zhangqiang 629eb98f1b Merge branch 'master_xma_local' into 0功能/神将觉醒 2020-11-11 11:37:26 +08:00
zhangqiang 90e9e84c64 【觉醒】十一星的星级展示修改 2020-11-11 11:12:14 +08:00
zhangqiang 053de93608 【神将觉醒】 提交 2020-11-10 18:35:37 +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
zhangqiang 48e6d33b7b 【神将觉醒】 效果图 资源 提交 2020-11-10 17:29:38 +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 ebe03eff48 【易经宝库】漏题 2020-11-10 16:43:24 +08:00
ZhangBiao 5a075c4fb5 【易经宝库】抽取灵兽报错修复 2020-11-10 16:27:31 +08:00
ZhangBiao 1ece0c1a77 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-10 16:25:56 +08:00
ZhangBiao ec9458aac7 【易经宝库】抽取灵兽报错修复 2020-11-10 16:25:42 +08:00
gaoxin b8c6bf7a62 【白泽】音效修改 2020-11-10 15:46:26 +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 0d56c34220 白泽灵兽语音修改 2020-11-10 15:28:25 +08:00
jiaoyangna 0d26c4d0ab Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-10 15:26:42 +08:00
jiaoyangna 2e125eaa47 新手引导修改 2020-11-10 15:26:33 +08:00
gongjiawei 55b629e576 白泽灵兽语音修改 2020-11-10 15:09:41 +08:00
liujiaqi 92ff0628c5 定卦神锄资源 2020-11-16 14:51:41 +08:00
liujiaqi 21248cf571 定卦神锄资源 2020-11-10 14:56:03 +08:00
JieLing 3e24ba9bcf Revert "定卦神锄新图标上传"
This reverts commit 495ea6e24e.
2020-11-10 14:47:18 +08:00
zhangqiang 53e538ea0d 【音效】 替换 2020-11-10 11:32:30 +08:00
zhangqiang 7f5287baa2 【音效】 替换 2020-11-10 11:32:06 +08:00