liujiaqi
|
5a7cb2f84c
|
乾坤宝匙相关修改,jump表试炼副本改运营活动
|
2020-07-16 15:44:01 +08:00 |
shihongyi
|
00a4234545
|
限时活动开启时间,关卡限制等级
|
2020-07-16 15:10:23 +08:00 |
szxhzz
|
045e07cff0
|
音频更新
|
2020-07-16 14:41:07 +08:00 |
liujiaqi
|
0cc615cb27
|
321星英雄技能特效
|
2020-07-16 11:51:56 +08:00 |
kansa
|
95a3be3363
|
修改全部怪物属性
|
2020-07-16 11:14:38 +08:00 |
szxhzz
|
43f2a437a6
|
音频更新
|
2020-07-16 11:03:09 +08:00 |
jiaoyangna
|
c282e19b5e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-16 10:49:10 +08:00 |
jiaoyangna
|
adc3b71e40
|
分解修改提交
|
2020-07-16 10:49:01 +08:00 |
shihongyi
|
c8134ea18c
|
微调
|
2020-07-16 10:33:09 +08:00 |
shihongyi
|
3d8efc8c95
|
紫色寻宝无法完成bug
|
2020-07-16 10:06:07 +08:00 |
altair
|
752cd999cc
|
添加英雄特效
|
2020-07-15 20:00:54 +08:00 |
kansa
|
d00251dfd7
|
修改森罗幻境次元炸弹配置方法
|
2020-07-15 18:45:52 +08:00 |
gongjiawei
|
f84d08ffeb
|
音频更新
|
2020-07-15 18:14:51 +08:00 |
skuld
|
bca13d2d6f
|
增加献祭英雄和分解宝物时的单次数量限制
|
2020-07-15 17:26:45 +08:00 |
shihongyi
|
9709e4abfb
|
首充英雄换孙悟空,跳过特权
|
2020-07-15 16:35:17 +08:00 |
jiaoyangna
|
e15bf9a7b2
|
轩辕宝镜资源提交
|
2020-07-15 16:27:58 +08:00 |
liujiaqi
|
ac8a07f482
|
老英雄名
|
2020-07-15 13:33:26 +08:00 |
shihongyi
|
9eccc41a8c
|
调整宝物精炼消耗
|
2020-07-15 12:14:57 +08:00 |
shihongyi
|
7f77abd772
|
跳过战斗特权
|
2020-07-15 11:43:28 +08:00 |
liujiaqi
|
a2ea55a33f
|
预览战斗修改
|
2020-07-14 20:01:24 +08:00 |
liujiaqi
|
931181e762
|
预览战斗修改,开服狂欢修改
|
2020-07-14 19:36:20 +08:00 |
skuld
|
a302b02fe0
|
增加每日探宝次数上限
|
2020-07-14 17:11:03 +08:00 |
skuld
|
0f97d3a592
|
修改归元返还比例
|
2020-07-14 15:47:00 +08:00 |
kansa
|
8ae73c896f
|
修改宝器的开启等级
|
2020-07-14 15:33:22 +08:00 |
shihongyi
|
0ee551e289
|
bug
|
2020-07-14 14:14:23 +08:00 |
shihongyi
|
65a82d10e2
|
归元
|
2020-07-14 10:15:25 +08:00 |
liujiaqi
|
6569de750f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-13 20:13:27 +08:00 |
liujiaqi
|
5b44b8fef5
|
4星武将技能名修改
|
2020-07-13 20:13:10 +08:00 |
skuld
|
b31020ec5f
|
调整献祭进度条位置
|
2020-07-13 20:07:19 +08:00 |
shihongyi
|
1562e97756
|
归元
|
2020-07-13 18:21:10 +08:00 |
liujiaqi
|
e717a4fa78
|
七天狂欢第三天登录奖励,乾坤抽魂印道具自愿修改
|
2020-07-13 18:02:50 +08:00 |
altair
|
09ca881967
|
修改配音配置
|
2020-07-13 17:49:24 +08:00 |
shihongyi
|
adaa54830d
|
归元
|
2020-07-13 17:24:30 +08:00 |
liujiaqi
|
11add2dd81
|
乾坤魂印兑换图标资源
|
2020-07-13 16:52:16 +08:00 |
shihongyi
|
4678a7e6ed
|
vipbugfix
|
2020-07-13 16:40:59 +08:00 |
shihongyi
|
f21a74ba75
|
归元、精炼宝物消耗
|
2020-07-13 16:06:06 +08:00 |
liujiaqi
|
1e50ce286d
|
技能生效范围和七日登录描述
|
2020-07-13 15:28:17 +08:00 |
kansa
|
1e2d9e646e
|
修改森罗幻境buff随机库
|
2020-07-13 15:20:19 +08:00 |
shihongyi
|
af24467d74
|
转盘积分箱内容丢失bugfix
|
2020-07-13 11:45:24 +08:00 |
shihongyi
|
053e8f6daa
|
调整通关奖励
|
2020-07-13 10:47:08 +08:00 |
gaoxin
|
58cc4bc0c3
|
部分字段改为前后端读取
|
2020-07-11 18:04:39 +08:00 |
gaoxin
|
8d25e6f9b2
|
修复VIP引导报错
|
2020-07-11 18:03:27 +08:00 |
altair
|
c43233121f
|
修改传记文字
|
2020-07-11 17:17:13 +08:00 |
altair
|
45d89d395b
|
修改技能配置
|
2020-07-11 16:49:07 +08:00 |
altair
|
5686fb219d
|
增加配音配置
|
2020-07-11 16:26:03 +08:00 |
gaoxin
|
27f46f4572
|
添加技能音效列
|
2020-07-11 15:22:03 +08:00 |
ZhangBiao
|
310802e967
|
language导出
|
2020-07-10 19:13:29 +08:00 |
shihongyi
|
c2370f561d
|
保底次数限时
|
2020-07-10 18:02:22 +08:00 |
ZhangBiao
|
0a5212d265
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-10 17:55:37 +08:00 |
ZhangBiao
|
b89c0582c0
|
宝囊
|
2020-07-10 17:55:11 +08:00 |
altair
|
be89bc0c42
|
修改引导内容
|
2020-07-10 17:48:24 +08:00 |
liujiaqi
|
d02a3adee8
|
法宝资源部分替换
|
2020-07-10 16:33:26 +08:00 |
shihongyi
|
b23f6fc806
|
乾坤宝囊分别红橙计数
|
2020-07-10 15:35:57 +08:00 |
skuld
|
81a5da6cfc
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-10 15:06:40 +08:00 |
skuld
|
fb91f85cab
|
修改8日奖励描述和奖励
|
2020-07-10 15:06:26 +08:00 |
liujiaqi
|
1e9c838e34
|
英雄命中
|
2020-07-10 14:08:12 +08:00 |
shihongyi
|
603c9803de
|
下调VIP1、2升级难度
|
2020-07-10 11:45:01 +08:00 |
shihongyi
|
b6e3410145
|
点金描述bug
|
2020-07-10 10:51:00 +08:00 |
shihongyi
|
220da97000
|
bug狂欢普通抽
|
2020-07-10 10:35:36 +08:00 |
liujiaqi
|
99c11f8305
|
英雄阵营备注修改
|
2020-07-10 10:24:37 +08:00 |
shihongyi
|
b449f521e6
|
另一个云游商店
|
2020-07-10 10:18:25 +08:00 |
shihongyi
|
3e749c1862
|
bug
|
2020-07-10 09:53:20 +08:00 |
shihongyi
|
78fca78236
|
bugfix
|
2020-07-09 20:31:18 +08:00 |
shihongyi
|
d56cefc732
|
乾坤商店匹配活动
|
2020-07-09 17:24:30 +08:00 |
shihongyi
|
339550d9e7
|
幻境杀怪掉落修改之2
|
2020-07-09 16:58:25 +08:00 |
kansa
|
7185629090
|
修改森罗幻境怪物属性
|
2020-07-09 16:10:31 +08:00 |
shihongyi
|
9383c02d40
|
幻境杀怪掉落初调
|
2020-07-09 15:58:07 +08:00 |
kansa
|
55155cc2c3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-09 15:17:45 +08:00 |
kansa
|
cca639cfba
|
修改森罗幻境商店错误
|
2020-07-09 15:15:19 +08:00 |
liujiaqi
|
83d578fbee
|
橙色4星装备名描述修改
|
2020-07-09 15:15:13 +08:00 |
shihongyi
|
ac28494c82
|
保底优化
|
2020-07-09 15:02:35 +08:00 |
liujiaqi
|
2e22a79119
|
怪物命中率修改
|
2020-07-09 15:00:32 +08:00 |
skuld
|
77c2b75175
|
修改每日召唤上限
|
2020-07-09 14:51:16 +08:00 |
shihongyi
|
047721e3a4
|
修复bug
|
2020-07-09 14:12:39 +08:00 |
liujiaqi
|
790c38edeb
|
英雄初始命中修改
|
2020-07-09 11:36:57 +08:00 |
shihongyi
|
f6421e9533
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-09 10:54:09 +08:00 |
shihongyi
|
6614cf3e70
|
乾坤宝囊up展示
|
2020-07-09 10:52:51 +08:00 |
kansa
|
3bd5576d98
|
删除怪物闪避和命中初始属性值
|
2020-07-09 10:52:42 +08:00 |
shihongyi
|
ccfb9132f3
|
去掉云游商店,增加乾坤商店
|
2020-07-09 10:45:37 +08:00 |
liujiaqi
|
7a22636e66
|
角色闪避命中率修改
|
2020-07-08 21:05:26 +08:00 |
shihongyi
|
ad03163b36
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-08 20:30:01 +08:00 |
shihongyi
|
9e4df66051
|
表提交
|
2020-07-08 20:18:24 +08:00 |
liujiaqi
|
b27725bd4a
|
红色装备获取跳转修改
|
2020-07-08 20:11:35 +08:00 |
gaoxin
|
ce13a0263e
|
Merge branch '战斗优化v_n.0' into master_develop
# Conflicts:
# .gitignore
# Assets/ManagedResources/Atlas/QianKunBox.meta
# Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ab_00014_t3_attack01.prefab.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Config/Data/CombatControl.lua
# Assets/ManagedResources/~Lua/Config/Data/SkillLogicConfig.lua
# Assets/StreamingAssets/Android.meta
|
2020-07-08 19:55:09 +08:00 |
gaoxin
|
da6bb67d50
|
技能配置优化
|
2020-07-08 18:23:12 +08:00 |
shihongyi
|
7b43f59192
|
乾坤宝囊
|
2020-07-08 16:55:28 +08:00 |
shihongyi
|
ab2689b4de
|
修复武将升级返还资源bug、新增乾坤宝囊各种道具、修复限时抽将保底bug、修复寻宝刷出6个1星任务时异常的bug
|
2020-07-08 15:35:58 +08:00 |
liujiaqi
|
09270d8f85
|
限时招募累计奖励召唤次数修改
|
2020-07-08 14:46:33 +08:00 |
liujiaqi
|
46850f0dd4
|
乾坤宝囊问号
|
2020-07-08 11:14:36 +08:00 |
gaoxin
|
b999786cbb
|
部分技能配置
|
2020-07-08 10:34:41 +08:00 |
shihongyi
|
e5d8e83c7f
|
修复bug调整部分概率
|
2020-07-08 10:10:17 +08:00 |
gaoxin
|
210114f62f
|
技能配置添加
|
2020-07-07 15:59:17 +08:00 |
zhangqiang
|
0a824f56ee
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-07 15:21:37 +08:00 |
zhangqiang
|
bff7df21e4
|
装备出售界面添加
|
2020-07-07 15:20:43 +08:00 |
liujiaqi
|
49a132852a
|
抽卡次数修正,装备叠加数量修改
|
2020-07-07 15:12:20 +08:00 |
shihongyi
|
96d5d080d5
|
超值基金2期bug、公会人数调整
|
2020-07-06 19:58:55 +08:00 |
shihongyi
|
c9668c674c
|
Merge branch 'master' into master_develop
# Conflicts:
# .gitignore
|
2020-07-06 17:57:51 +08:00 |
shihongyi
|
6cee0b79fe
|
xunbaobug
|
2020-07-06 17:50:27 +08:00 |
shihongyi
|
d6e292caa6
|
Revert "tiangongtanbaobug"
This reverts commit d76752e426 .
|
2020-07-06 17:48:29 +08:00 |
shihongyi
|
d76752e426
|
tiangongtanbaobug
|
2020-07-06 17:47:25 +08:00 |
2han9B1a0
|
e3c9fb459e
|
寻宝文字提示修改,特权界面资源替换
|
2020-07-06 17:01:50 +08:00 |
zhangqiang
|
4b8bae38b3
|
宝物分解界面提交
|
2020-07-06 16:27:27 +08:00 |
gaoxin
|
903cd68134
|
文件名修改
|
2020-07-06 11:59:53 +08:00 |
gaoxin
|
4508220751
|
bat文件添加
|
2020-07-06 11:58:59 +08:00 |
gaoxin
|
1251f17d4d
|
尝试命令行执行
|
2020-07-06 11:02:40 +08:00 |
gaoxin
|
5a2a3f83d2
|
excel 工具完善
|
2020-07-06 10:56:55 +08:00 |
gaoxin
|
d62d808e80
|
提交
|
2020-07-06 10:09:45 +08:00 |
gaoxin
|
608c296452
|
导表工具优化
|
2020-07-05 19:21:15 +08:00 |
zhangqiang
|
385a8c86a1
|
bug 新手引导福利位置偏
|
2020-07-04 15:26:36 +08:00 |
gaoxin
|
0bdb498338
|
添加全屏弹道按列区分释放位移
|
2020-07-03 16:50:14 +08:00 |
JieLing
|
6a317d3f7b
|
测试热更0.15.25、svn逻辑同步
|
2020-07-03 11:52:23 +08:00 |
2han9B1a0
|
abfbfc423b
|
心魔文字修改、成长基金开启条件修改、文字:传说修改、四元阵卡池显示修改、自选宝箱提示修改
|
2020-07-03 11:27:25 +08:00 |
gaoxin
|
5b5577d50b
|
添加全屏弹道技能
|
2020-07-02 19:23:42 +08:00 |
JieLing
|
ab411b3d0d
|
svn逻辑同步
|
2020-07-02 17:04:46 +08:00 |
JieLing
|
461c64b04a
|
svn逻辑同步
|
2020-07-02 14:53:44 +08:00 |
skuld
|
cadced19c9
|
修改每日召唤次数上限
|
2020-07-02 14:50:03 +08:00 |
gaoxin
|
78b6a988d2
|
战斗添加前摇特效,添加多段伤害
|
2020-07-01 17:48:00 +08:00 |
JieLing
|
c4751eed0a
|
svn逻辑同步
|
2020-07-01 10:54:39 +08:00 |
JieLing
|
5154fdbac0
|
外网0.16.14 内网0.15.25
|
2020-07-01 09:40:20 +08:00 |
JieLing
|
d08552ca2f
|
外网0.16.13 内网0.15.24
|
2020-06-30 18:59:44 +08:00 |
JieLing
|
7382b2db77
|
版本开发提交
|
2020-06-28 17:52:29 +08:00 |
JieLing
|
8c61581548
|
外网 0.16.10 内网 0.15.23
|
2020-06-28 17:48:49 +08:00 |
JieLing
|
d87ab3767e
|
内网 0.15.20
|
2020-06-23 18:36:24 +08:00 |
JieLing
|
e3b6de5404
|
内网0.15.17 外网 0.16.8
|
2020-06-19 21:44:27 +08:00 |
JieLing
|
75a3f83194
|
内网0.15.16 外网 0.16.7
|
2020-06-19 20:19:35 +08:00 |
JieLing
|
7a410e1b60
|
内网测试 0.15.5
|
2020-06-19 16:18:05 +08:00 |
JieLing
|
e189462ac9
|
内网测试 0.15.14
|
2020-06-18 20:39:29 +08:00 |
JieLing
|
cf5f3e9952
|
内网测试 0.15.12
|
2020-06-13 11:47:13 +08:00 |
JieLing
|
2db43096de
|
补充提交
|
2020-06-12 18:04:22 +08:00 |
JieLing
|
90e12f1a4a
|
外网0.16.5,测试0.15.11
|
2020-06-08 20:18:49 +08:00 |
JieLing
|
b499b77bbe
|
外网0.16.4版本热更
|
2020-06-08 13:57:30 +08:00 |
JieLing
|
ab3dbad074
|
测试服热更0.15.6提交
|
2020-06-05 16:16:22 +08:00 |
JieLing
|
59db757cf9
|
六月三号开发提交
|
2020-06-03 19:09:01 +08:00 |
JieLing
|
9a7de6479c
|
外网0.16.3
|
2020-06-03 19:01:14 +08:00 |
JieLing
|
6019de7c1e
|
外网0.16.2
|
2020-05-25 19:55:27 +08:00 |
JieLing
|
063868ce73
|
外网包 0.16.1
|
2020-05-25 19:16:23 +08:00 |
JieLing
|
6b3a4b5fb9
|
切换为android平台
|
2020-05-15 17:46:08 +08:00 |
JieLing
|
266b9065d8
|
测试版本 带热更 0.15.1
|
2020-05-15 16:52:35 +08:00 |
JieLing
|
00892194b5
|
提交
|
2020-05-11 09:38:52 +08:00 |
JieLing
|
3a6591404d
|
提交
|
2020-05-09 14:12:31 +08:00 |
JieLing
|
9f11647205
|
表数据提交
|
2020-05-09 12:49:09 +08:00 |