jiaoyangna
|
2079a4efcb
|
适配修改提交
|
2021-12-13 15:08:02 +08:00 |
ZhangBiao
|
ab5b654b73
|
【法宝聚灵】增加特效
|
2021-12-13 12:14:46 +08:00 |
jiaoyangna
|
9069b2ed2c
|
招募秘宝提交
|
2021-12-10 14:58:14 +08:00 |
jiaoyangna
|
fe0efcb631
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
|
2021-12-10 13:42:27 +08:00 |
jiaoyangna
|
e33181dddb
|
招募秘宝提交
|
2021-12-10 13:41:03 +08:00 |
gaoxin
|
f846d6f17e
|
【战斗】加入三倍速
|
2021-12-08 16:39:37 +08:00 |
jiaoyangna
|
1136879d55
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-08 14:03:43 +08:00 |
jiaoyangna
|
9b1ca0135c
|
【ID1010829】
增加开服竞技比拼活动——竞技试炼
|
2021-12-08 14:03:23 +08:00 |
ZhangBiao
|
86f1620e7d
|
【连购好礼】活动时间兼容调整
|
2021-12-07 15:22:52 +08:00 |
ZhangBiao
|
692425511c
|
【寻宝迷踪】增加珍奇宝阁入口
|
2021-12-06 18:44:33 +08:00 |
jiaoyangna
|
d9f71e2f48
|
大闹天宫添加神魂等级
|
2021-12-06 17:47:14 +08:00 |
ZhangBiao
|
78e8865e95
|
【连购礼包】提交
|
2021-12-06 16:59:10 +08:00 |
jiaoyangna
|
9ae56712c4
|
添加已获得标志
|
2021-12-06 16:04:01 +08:00 |
luyao
|
83044f0586
|
Merge branch 'china/dev' into china/dev_res
|
2021-12-06 15:43:40 +08:00 |
ZhangBiao
|
6bf98e7c9f
|
【修行】结构修改
|
2021-12-06 13:02:18 +08:00 |
jiaoyangna
|
2c83c873b9
|
时间修改提交
|
2021-12-06 10:32:31 +08:00 |
jiaoyangna
|
7e1cac4cbe
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-06 09:58:25 +08:00 |
jiaoyangna
|
6309159f77
|
方寸寻宝修改提交
|
2021-12-06 09:58:04 +08:00 |
ZhangBiao
|
011c8d7f5d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-03 19:01:27 +08:00 |
ZhangBiao
|
e2ec6d9765
|
【连购礼包】奖励靠左
|
2021-12-03 19:01:17 +08:00 |
jiaoyangna
|
b19801639d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-03 18:03:53 +08:00 |
jiaoyangna
|
660bbdf997
|
方寸寻宝修改提交
|
2021-12-03 18:03:36 +08:00 |
ZhangBiao
|
7348534847
|
【去除多余活动信息】
|
2021-12-03 16:46:40 +08:00 |
ZhangBiao
|
8e7afd757d
|
【连购礼包】提交
|
2021-12-03 13:21:15 +08:00 |
ZhangBiao
|
ed5e0f6ab1
|
Merge branch 'china/dev' into 0活动开发聚集地/连购礼包
|
2021-12-03 10:00:31 +08:00 |
ZhangBiao
|
4c7b379ce7
|
【灵脉秘境】1号灵脉的灵气数值超框
|
2021-12-02 19:49:49 +08:00 |
ZhangBiao
|
55f2e6e783
|
Merge branch 'china/dev' into 0活动开发聚集地/连购礼包
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-12-02 17:16:00 +08:00 |
jiaoyangna
|
aa0e501b4b
|
ID1019319】
【神将情报】神将到达330级时情报右侧显示提示应为“最高等级”
|
2021-12-02 16:01:01 +08:00 |
jiaoyangna
|
7b8306f98a
|
【ID1010715】
【公会信息优化】公会名称底框右侧添加编辑图标
|
2021-12-02 15:31:23 +08:00 |
jiaoyangna
|
1253466912
|
天地烘炉提交
|
2021-12-02 15:18:56 +08:00 |
ZhangBiao
|
0b5575c6f2
|
Merge branch 'china/dev' into china/dev_res
# Conflicts:
# Assets/ManagedResources/EffectResSkill/Effect_c_lingshou_fanzhuan/Materials/fx_kapianfanmian_daoguangppp.mat.meta
# Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Materials/blz_400_dagger_end 2.mat.meta
# Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Model/fuwenlujing_ctrl.controller.meta
# Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Prefab/c_dao_guocheng.prefab
# Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Prefab/c_ren_guocheng.prefab
# Assets/ManagedResources/Spine/c_0054/c_0054_Atlas.asset.meta
# Assets/ManagedResources/Spine/c_0054/c_0054_Material.mat.meta
# Assets/ManagedResources/Spine/c_0054/c_0054_SkeletonData.asset.meta
# Assets/ManagedResources/Spine/s_fuxi/s_fuxi_Atlas.asset.meta
# Assets/ManagedResources/Spine/s_fuxi/s_fuxi_SkeletonData.asset.meta
|
2021-12-02 14:39:03 +08:00 |
ZhangBiao
|
f431eea90c
|
【连购礼包】提交
|
2021-12-02 14:03:38 +08:00 |
ZhangBiao
|
63bf32f335
|
【战斗】白片尝试修改
|
2021-12-01 13:59:22 +08:00 |
gaoxin
|
2e2c4292b6
|
【引导】修复修为引导位置错误
|
2021-11-30 21:27:26 +08:00 |
gaoxin
|
f090e9b792
|
【特效】哪吒技能特效时间优化
|
2021-11-30 13:42:49 +08:00 |
gaoxin
|
9fdf7687fa
|
【特效】哪吒技能特效时间优化
|
2021-11-30 13:42:14 +08:00 |
gaoxin
|
95251dd5e1
|
【特效】牛魔王特效显示优化
|
2021-11-29 17:42:55 +08:00 |
jiaoyangna
|
658a655f2c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-29 17:18:06 +08:00 |
jiaoyangna
|
76a94a227e
|
文字大小修改
|
2021-11-29 17:17:50 +08:00 |
wangzhenxing
|
ac32149aa8
|
[立绘朝向]=====皮肤,敌方立绘朝向修改
|
2021-11-29 17:07:28 +08:00 |
jiaoyangna
|
bce0b9b9ff
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-29 16:35:39 +08:00 |
jiaoyangna
|
ff48e4c11f
|
天地烘炉修改提交
|
2021-11-29 16:35:23 +08:00 |
gaoxin
|
bead1c571a
|
【对话】显示异常修复
|
2021-11-29 15:57:54 +08:00 |
gaoxin
|
c035221989
|
【剧情】立绘和文字出现的节奏调整
|
2021-11-29 13:50:29 +08:00 |
gaoxin
|
6c6ce74081
|
【立绘】伏羲立绘删除脚下的阵
|
2021-11-29 13:20:45 +08:00 |
gaoxin
|
2b642464a5
|
【立绘】伏羲立绘删除脚下的阵
|
2021-11-29 13:19:29 +08:00 |
gaoxin
|
0d1c025624
|
【活动】连续礼包,添加
|
2021-12-02 01:44:29 +08:00 |
ZhangBiao
|
a8e619b8c6
|
【乾坤宝盒】去除珍奇宝阁
|
2021-11-27 17:03:58 +08:00 |
luyao
|
352de7108e
|
【神将头像朝向修改左>右】
|
2021-11-27 16:45:05 +08:00 |
ZhangBiao
|
1775784bcd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-27 16:34:59 +08:00 |