kansa
|
ed75ba814b
|
修改关卡怪物系别错误
|
2020-07-29 14:45:57 +08:00 |
wangyuan
|
f5e6c90487
|
排查了一下打折相关所有的价值 比例不正确的进行了一下微调
|
2020-07-29 13:59:31 +08:00 |
kansa
|
829ab2e608
|
修改错误
|
2020-07-29 12:41:10 +08:00 |
kansa
|
183d8c1a74
|
修改车迟斗法怪物属性
|
2020-07-29 12:40:16 +08:00 |
wangyuan
|
ff5b2f6ecb
|
工会商店去掉折扣展示
|
2020-07-29 12:13:19 +08:00 |
wangyuan
|
3acfcab88f
|
道具商店折扣修改
|
2020-07-29 11:39:24 +08:00 |
wangyuan
|
c0d8db5253
|
仙尘商店去掉折扣 寻宝图和普通抽奖的价格修改
|
2020-07-29 11:31:48 +08:00 |
altair
|
f81db7ac81
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 23:06:10 +08:00 |
altair
|
7e7b873e31
|
修改播放时机
|
2020-07-28 23:06:03 +08:00 |
kansa
|
b462d8056e
|
修改限时招募和乾坤包囊活动时间
|
2020-07-28 22:32:47 +08:00 |
wangyuan
|
7c7fabc3d0
|
修改商店物品价格
|
2020-07-28 21:35:26 +08:00 |
wangyuan
|
b2c515de97
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 21:15:31 +08:00 |
liujiaqi
|
a6a9575b98
|
1152技能描述
|
2020-07-28 21:12:39 +08:00 |
wangyuan
|
9ca5a21a96
|
妖魂魔符换成幸运探宝券和置换玉换成九转金丹 所有道具对应价格表 配置成打折道具
|
2020-07-28 20:52:40 +08:00 |
kansa
|
77a7c52ca1
|
修改活动持续时间
|
2020-07-28 20:27:17 +08:00 |
altair
|
6f1932faaa
|
修改道具描述
|
2020-07-28 20:24:49 +08:00 |
altair
|
30aed85812
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 20:09:49 +08:00 |
altair
|
42740e5e19
|
修改指引文字
|
2020-07-28 20:09:39 +08:00 |
szxhzz
|
b0c0bf5da0
|
配置表更新
|
2020-07-28 19:08:28 +08:00 |
altair
|
05486c779b
|
修改帮助文字
|
2020-07-28 17:55:44 +08:00 |
altair
|
fff72e4047
|
修改图片
|
2020-07-28 17:53:50 +08:00 |
altair
|
4b9a9d27d2
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# data_execl/base_data/ItemConfig.xlsx
|
2020-07-28 17:50:18 +08:00 |
altair
|
2168db33a3
|
修改道具图片
|
2020-07-28 17:43:02 +08:00 |
liujiaqi
|
f9c686d56e
|
技能描述修改
|
2020-07-28 17:36:45 +08:00 |
liujiaqi
|
ce3d5f8eda
|
技能描述修改
|
2020-07-28 17:28:53 +08:00 |
liujiaqi
|
b1e011e049
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 17:07:22 +08:00 |
liujiaqi
|
1ff4c353a6
|
bug礼包和入群礼包
|
2020-07-28 17:06:54 +08:00 |
shihongyi
|
4ea92473b9
|
bugfix
|
2020-07-28 17:06:37 +08:00 |
zhangqiang
|
2a87d43fd0
|
bug
|
2020-07-31 17:36:06 +08:00 |
altair
|
701faa8360
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 16:38:57 +08:00 |
altair
|
f48b05e535
|
修改特效配置,挂机对话,帮助文字
|
2020-07-28 16:38:49 +08:00 |
kansa
|
29b60d30c4
|
修改大闹天空圣物掉落
|
2020-07-28 16:29:25 +08:00 |
altair
|
afc2fa5c86
|
修改道具图片
|
2020-07-28 15:48:23 +08:00 |
altair
|
9d5280d025
|
修改道具名称
|
2020-07-28 15:37:52 +08:00 |
shihongyi
|
fa241a43b2
|
限时通关首个钻石改10连、竞技场寻宝微调
|
2020-07-28 15:26:00 +08:00 |
ZhangBiao
|
cec1f145b6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-28 09:48:26 +08:00 |
ZhangBiao
|
48ac527f1a
|
限时召唤 乾坤宝盒 页面整合
|
2020-07-28 09:48:02 +08:00 |
altair
|
aff5c002a9
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# data_execl/base_data/CombatControl.xlsx
|
2020-07-27 21:04:51 +08:00 |
altair
|
66f2e2860d
|
修改特效及文字表
|
2020-07-27 20:05:26 +08:00 |
gaoxin
|
c25fc7e39d
|
bulletTime字段权限修改
|
2020-07-27 19:45:37 +08:00 |
shihongyi
|
854c359043
|
献祭、归元、吃掉返还调整
|
2020-07-27 18:23:37 +08:00 |
altair
|
3f490c64b9
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-27 18:13:06 +08:00 |
altair
|
5d08c6832a
|
修改受击特效
|
2020-07-27 18:09:38 +08:00 |
shihongyi
|
178b3054b7
|
道具商城
|
2020-07-27 17:00:52 +08:00 |
liujiaqi
|
807d6745ac
|
描述调整
|
2020-07-27 16:17:02 +08:00 |
skuld
|
974f5a1fd5
|
添加活动开启时间和描述
|
2020-07-27 15:54:02 +08:00 |
altair
|
57c748b960
|
修改挂机文字
|
2020-07-27 11:22:09 +08:00 |
kansa
|
2fa696094a
|
修改竞技场引导战斗用机器人
|
2020-07-27 09:59:28 +08:00 |
altair
|
7692325864
|
修改图标
|
2020-07-25 23:07:54 +08:00 |
altair
|
ddd0aff41c
|
修改图片配置
|
2020-07-25 22:50:29 +08:00 |
altair
|
039e831582
|
修改图标
|
2020-07-25 20:47:20 +08:00 |
altair
|
9f5b75213e
|
修改特效配置
|
2020-07-25 20:39:20 +08:00 |
altair
|
3b26247c5d
|
修改图鉴图片
|
2020-07-25 19:47:49 +08:00 |
altair
|
8afcc5fdf4
|
修改图鉴图片
|
2020-07-25 19:43:31 +08:00 |
altair
|
fcdf21e2bd
|
修改立绘错误
|
2020-07-25 18:51:08 +08:00 |
gaoxin
|
5d6543caee
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 18:37:27 +08:00 |
gaoxin
|
0a35d31531
|
关闭星成长礼拍脸
|
2020-07-25 18:37:19 +08:00 |
altair
|
901442e847
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 18:34:38 +08:00 |
altair
|
b435345177
|
修改声效触发时机
|
2020-07-25 18:34:26 +08:00 |
kansa
|
686ae9a826
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 18:07:35 +08:00 |
kansa
|
b4577b9718
|
修改竞技场机器人库,使其匹配大闹天宫
|
2020-07-25 18:07:13 +08:00 |
shihongyi
|
7028de188e
|
bug
|
2020-07-25 18:02:58 +08:00 |
altair
|
71438e88c3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-25 17:39:34 +08:00 |
altair
|
8281ce1733
|
添加缺失效果
|
2020-07-25 17:38:52 +08:00 |
shihongyi
|
671441d305
|
巅峰时间、充值屏蔽
|
2020-07-25 17:16:58 +08:00 |
zhangqiang
|
a65257a740
|
剑影仙踪去掉拍脸
|
2020-09-11 21:37:17 +08:00 |
gaoxin
|
2b7eb6bf2a
|
Merge branch '英雄技能特效添加' into master_develop
# Conflicts:
# Assets/Effect/Prefab.meta
# Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_bhxz_00013_t1_attack_01.prefab.meta
# Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchGuessTipViewPopup.lua.meta
|
2020-07-25 16:13:55 +08:00 |
altair
|
773448d96c
|
修改特效
|
2020-07-25 16:11:10 +08:00 |
zhangqiang
|
1845d662ab
|
巅峰战竞猜结果新加界面 新手引导修改主线开始战斗按钮名称
|
2020-09-07 21:15:40 +08:00 |
shihongyi
|
ab7e0c022d
|
test
|
2020-07-25 14:06:55 +08:00 |
shihongyi
|
5623050a01
|
变强屏蔽充值跳转、屏蔽巅峰商店
|
2020-07-24 19:20:13 +08:00 |
skuld
|
f6415aa772
|
修改巅峰赛规则
|
2020-08-05 23:19:28 +08:00 |
shihongyi
|
05f0d11729
|
巅峰战战斗回合、充值留特权商城
|
2020-07-24 17:15:30 +08:00 |
kansa
|
44b83f6fdd
|
修改圣物错误描述
|
2020-07-24 17:13:25 +08:00 |
shihongyi
|
409874c052
|
限时折扣推送 18级 因屏蔽充值 改998
|
2020-07-24 16:15:43 +08:00 |
shihongyi
|
cac0384012
|
屏充值
|
2020-07-24 16:04:31 +08:00 |
shihongyi
|
1ffb97cf9f
|
巅峰赛开启时间
|
2020-07-24 15:16:44 +08:00 |
shihongyi
|
bffd51518d
|
归元
|
2020-07-24 12:10:35 +08:00 |
skuld
|
be095cbb7b
|
修改竞技场帮助文本
|
2020-07-24 11:19:16 +08:00 |
shihongyi
|
a5e0f98bcd
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-24 10:46:12 +08:00 |
shihongyi
|
d4f48e575d
|
暂屏付费之2
|
2020-07-24 10:45:51 +08:00 |
kansa
|
cbfc420a96
|
修改竞技场刷新时间为7天
|
2020-07-24 10:43:32 +08:00 |
shihongyi
|
dc9fa4e880
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-24 10:08:06 +08:00 |
shihongyi
|
7418fd2fa7
|
暂屏充值test
|
2020-07-24 10:06:54 +08:00 |
zhangqiang
|
3fa23c25ea
|
修改界面id
|
2020-07-23 21:29:40 +08:00 |
zhangqiang
|
3588a17c00
|
Merge branch 'master_develop' into master_arena
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
# data_execl/base_data/UIConfig.xlsx
|
2020-07-23 21:24:00 +08:00 |
shihongyi
|
d820ef152a
|
bugfix
|
2020-07-23 18:19:26 +08:00 |
zhangqiang
|
94684153c3
|
回放三局两胜显示
|
2020-07-23 18:06:55 +08:00 |
shihongyi
|
de99aed8a5
|
充值表修改备注、献祭表id大小写、调整转盘奖励
|
2020-07-23 17:32:12 +08:00 |
ZhangBiao
|
7fb5ac778f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-23 15:44:51 +08:00 |
ZhangBiao
|
9b290c1ed5
|
图片资源替换
|
2020-07-23 15:44:40 +08:00 |
jiaoyangna
|
4af617da49
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-23 15:43:23 +08:00 |
altair
|
a8c5d9b7d7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-23 15:29:11 +08:00 |
altair
|
9a58ce4eb1
|
修改提示文字
|
2020-07-23 15:29:04 +08:00 |
zhangqiang
|
3b3dbec6a7
|
添加巅峰赛编队
|
2020-07-23 14:36:28 +08:00 |
kansa
|
a681ca2cfc
|
增加怪物天赋的升级成长,修改怪物属性
|
2020-07-23 14:18:15 +08:00 |
shihongyi
|
fbc49bbaae
|
送神
|
2020-07-23 13:54:46 +08:00 |
altair
|
7fdcd31685
|
提示文字修改
|
2020-07-23 13:46:12 +08:00 |
gaoxin
|
3cf3cf7e90
|
特效旋转功能添加
|
2020-07-23 13:44:03 +08:00 |
altair
|
c16a0d32d2
|
修改引导文字
|
2020-07-23 11:31:11 +08:00 |