jiaoyangna
|
1e17151d7f
|
Merge branch 'china/dev' into 0功能/Incarnation
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-11-26 11:35:57 +08:00 |
jiaoyangna
|
964a1b4fde
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 11:34:57 +08:00 |
jiaoyangna
|
b78e2335fa
|
身外化身提交
|
2021-11-26 11:34:25 +08:00 |
ZhangBiao
|
c8fa05d5a0
|
【固定活动】提交
|
2021-11-26 11:09:22 +08:00 |
jiaoyangna
|
c0c8a6710c
|
身外化身提交
|
2021-11-26 11:08:48 +08:00 |
ZhangBiao
|
7ef385ac53
|
【固定活动】提交
|
2021-11-26 10:34:41 +08:00 |
ZhangBiao
|
45df1fb982
|
【寻仙招募】增加心愿阵营条
|
2021-11-26 09:54:12 +08:00 |
jiaoyangna
|
8a3ca0cb97
|
天地洪炉提交
|
2021-11-25 19:06:20 +08:00 |
jiaoyangna
|
34949242a9
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
|
2021-11-25 18:57:48 +08:00 |
jiaoyangna
|
fd22b5a87f
|
天地洪炉提交
|
2021-11-25 18:55:20 +08:00 |
ZhangBiao
|
db5627ab24
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 18:51:46 +08:00 |
ZhangBiao
|
fd97f584cb
|
【固定活动】调整
|
2021-11-25 18:51:36 +08:00 |
wangzhenxing
|
7949e8c21c
|
【战斗】========灵兽卡面翻转提交
|
2021-11-25 18:47:53 +08:00 |
wangzhenxing
|
6927b52365
|
[战斗]=======主角变身卡添加gm
|
2021-11-25 18:36:00 +08:00 |
ZhangBiao
|
cb331c612e
|
【删除活动类那个43】
|
2021-11-25 16:51:35 +08:00 |
jiaoyangna
|
a248330241
|
Merge branch 'china/dev' into 0功能/Incarnation
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua
|
2021-11-25 16:10:14 +08:00 |
ZhangBiao
|
8da0a81588
|
【寻仙抽】提交
|
2021-11-25 15:59:31 +08:00 |
gaoxin
|
b316f54e50
|
【战斗】护盾特效层级问题优化
|
2021-11-25 14:46:46 +08:00 |
ZhangBiao
|
0f0f08b260
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-25 11:52:45 +08:00 |
ZhangBiao
|
1c9d113a86
|
【活动、修为】界面调整
|
2021-11-25 11:52:35 +08:00 |
gaoxin
|
53648fbbe3
|
【每日豪礼】预设文字替换
|
2021-11-25 11:20:00 +08:00 |
ZhangBiao
|
0d3f9c36ad
|
【灵脉秘境】背景图
|
2021-11-24 18:43:59 +08:00 |
ZhangBiao
|
ac768ff163
|
【常驻活动】提交
|
2021-11-24 18:14:25 +08:00 |
ZhangBiao
|
2d25ebb61b
|
【修为】修为调整
|
2021-11-24 11:30:55 +08:00 |
ZhangBiao
|
60c12192af
|
【灵脉秘境】记录时间文字不显示修改
|
2021-11-23 10:43:38 +08:00 |
jiaoyangna
|
e88f1f7b01
|
【ID1019276】
【法宝聚灵】改排版后,返回按钮遮挡技能描述
|
2021-11-23 10:31:09 +08:00 |
jiaoyangna
|
5e8f8c59a1
|
添加底图
|
2021-11-22 15:48:54 +08:00 |
wangzhenxing
|
f980485ce2
|
[战斗表现]========足下阴影显示修改
|
2021-11-22 15:18:44 +08:00 |
jiaoyangna
|
9abd87c14b
|
战力添加
|
2021-11-22 15:06:44 +08:00 |
jiaoyangna
|
7647b0057e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 14:15:55 +08:00 |
jiaoyangna
|
85ef5170bb
|
文字修改提交
|
2021-11-22 14:15:26 +08:00 |
ZhangBiao
|
025edbcacf
|
【灵脉秘境】界面修改、红点修改
|
2021-11-22 14:13:49 +08:00 |
jiaoyangna
|
112f7fd196
|
滑动修改提交
|
2021-11-22 14:11:40 +08:00 |
jiaoyangna
|
a568ec1707
|
隐藏特效底
|
2021-11-22 14:01:40 +08:00 |
ZhangBiao
|
aa52131d3f
|
【灵脉秘境】文字遮挡、跳转
|
2021-11-22 13:27:54 +08:00 |
jiaoyangna
|
047e5cbe72
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 11:46:56 +08:00 |
jiaoyangna
|
0d073eb323
|
属性界面修改提交i
|
2021-11-22 11:44:48 +08:00 |
gaoxin
|
f78031984a
|
【背包】法宝聚灵页签添加
|
2021-11-22 11:18:28 +08:00 |
jiaoyangna
|
e61de063cf
|
法宝聚灵修改提交
|
2021-11-22 11:01:43 +08:00 |
jiaoyangna
|
8c10c104d8
|
适配修改
|
2021-11-19 19:10:05 +08:00 |
jiaoyangna
|
6916a5f95a
|
适配修改提交
|
2021-11-19 19:08:11 +08:00 |
jiaoyangna
|
4a36c62362
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-19 18:52:12 +08:00 |
ZhangBiao
|
c9faa2e74d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-19 18:43:01 +08:00 |
ZhangBiao
|
a334b3536f
|
【灵脉秘境】界面设配调整
|
2021-11-19 18:42:50 +08:00 |
jiaoyangna
|
2978dc203c
|
添加特效,添加点击事件
|
2021-11-19 18:32:22 +08:00 |
jiaoyangna
|
5ef8b89239
|
文字位置修改提交
|
2021-11-19 18:15:19 +08:00 |
jiaoyangna
|
db0fcea43e
|
Merge branch 'china/dev' into 0功能/TailsMainSoul
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-11-19 18:01:59 +08:00 |
ZhangBiao
|
f1737b1c5d
|
【灵脉秘境】提交
|
2021-11-19 17:48:56 +08:00 |
jiaoyangna
|
c058e0ac74
|
底图修改提交
|
2021-11-19 17:39:38 +08:00 |
ZhangBiao
|
95f71667fe
|
【灵脉秘境】提交
|
2021-11-19 17:23:06 +08:00 |
jiaoyangna
|
d62584866e
|
星星缺少修改
|
2021-11-19 17:17:28 +08:00 |
jiaoyangna
|
467dd1aebb
|
添加特效提交
|
2021-11-19 17:08:14 +08:00 |
ZhangBiao
|
9f356783e1
|
【灵脉秘境】提交
|
2021-11-19 17:01:10 +08:00 |
jiaoyangna
|
bc62311af9
|
法宝之魂第二个界面提交
|
2021-11-19 16:52:15 +08:00 |
ZhangBiao
|
c8d4cadb2b
|
【灵脉秘境】提交
|
2021-11-19 15:38:41 +08:00 |
jiaoyangna
|
d69b3c8ca5
|
Merge branch 'china/dev' into 0功能/TailsMainSoul
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-11-19 14:35:42 +08:00 |
ZhangBiao
|
c9e465f662
|
【灵脉秘境】提交
|
2021-11-19 11:45:53 +08:00 |
jiaoyangna
|
9e99347a2b
|
法宝聚灵提交
|
2021-11-19 11:37:26 +08:00 |
jiaoyangna
|
808dcddc62
|
法宝聚灵界面1提交
|
2021-11-19 11:33:34 +08:00 |
ZhangBiao
|
6454e84172
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-18 19:07:50 +08:00 |
ZhangBiao
|
fc704b98c3
|
【灵脉秘境】资源提交
|
2021-11-18 19:07:19 +08:00 |
ZhangBiao
|
c994c9e636
|
【灵脉秘境】提交
|
2021-11-18 18:43:22 +08:00 |
wangzhenxing
|
45bc2139a6
|
[战斗表现]=========我方前排血条位置修改
|
2021-11-18 18:37:14 +08:00 |
wangzhenxing
|
b74561d70b
|
[战斗表现]===============敌我前后排立绘缩放大小固定
|
2021-11-18 18:29:13 +08:00 |
ZhangBiao
|
f79de8970c
|
【灵脉秘境】提交
|
2021-11-18 15:45:21 +08:00 |
jiaoyangna
|
efe7866916
|
身外化身添加属性显示
|
2021-11-18 15:39:00 +08:00 |
ZhangBiao
|
de7a516a87
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-18 13:30:03 +08:00 |
ZhangBiao
|
8125ed131e
|
【灵脉秘境】提交
|
2021-11-18 13:17:28 +08:00 |
jiaoyangna
|
4d887421ea
|
身外化身提交
|
2021-11-18 11:55:26 +08:00 |
ZhangBiao
|
03cdea5c83
|
【灵脉秘境】纪录提交
|
2021-11-18 11:35:20 +08:00 |
ZhangBiao
|
e174e24bc1
|
【灵脉秘境】提交
|
2021-11-18 10:26:14 +08:00 |
wangzhenxing
|
d87d9f621e
|
[战斗表现]=======战斗界面卡牌显示修改
|
2021-11-17 18:37:43 +08:00 |
ZhangBiao
|
790fe1c88f
|
【灵脉秘境】提交
|
2021-11-17 18:28:59 +08:00 |
wangzhenxing
|
6ee80e7a9f
|
[战斗表现]================战斗表现修改提交
|
2021-11-17 17:29:17 +08:00 |
ZhangBiao
|
2b2a77a129
|
【灵脉秘境】提交
|
2021-11-17 16:14:47 +08:00 |
ZhangBiao
|
d8dd88b2e2
|
【灵脉秘境】提交
|
2021-11-16 18:30:08 +08:00 |
jiaoyangna
|
ec48fa55f0
|
Merge branch 'china/dev' into 0功能/TailsMainSoul
# Conflicts:
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-11-16 17:34:22 +08:00 |
jiaoyangna
|
23a55ef0dc
|
天宫寻宝特效修改提交
(cherry picked from commit 791ac14e2e)
|
2021-11-16 17:28:24 +08:00 |
jiaoyangna
|
791ac14e2e
|
天宫寻宝特效修改提交
|
2021-11-16 17:27:49 +08:00 |
jiaoyangna
|
6e2deee6f1
|
【ID1019165】
【灵兽列表】部分星星显示位置错误
(cherry picked from commit a9709ad212)
|
2021-11-16 16:41:30 +08:00 |
jiaoyangna
|
a9709ad212
|
【ID1019165】
【灵兽列表】部分星星显示位置错误
|
2021-11-16 16:40:34 +08:00 |
jiaoyangna
|
1e4a7a57be
|
法宝之魂 提交
|
2021-11-16 15:24:17 +08:00 |
wangzhenxing
|
1361867887
|
【坐骑】=======四不像提交
|
2021-11-16 13:31:28 +08:00 |
ZhangBiao
|
d717519d93
|
【灵脉秘境】提交
|
2021-11-16 11:21:37 +08:00 |
jiaoyangna
|
aa6a031fdf
|
法宝聚灵提交
|
2021-11-16 09:33:10 +08:00 |
jiaoyangna
|
e6f4e50656
|
法宝聚灵
|
2021-11-15 18:24:39 +08:00 |
ZhangBiao
|
ff3fcf3db9
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-15 09:56:59 +08:00 |
ZhangBiao
|
07a87548aa
|
【灵脉秘境】提交
|
2021-11-15 09:56:02 +08:00 |
gaoxin
|
83583747ad
|
Merge branch '0功能/和谐资源后台控制' into china/dev
|
2021-11-12 16:39:53 +08:00 |
ZhangBiao
|
c5a7206184
|
【灵脉秘境】提交
|
2021-11-11 17:53:47 +08:00 |
ZhangBiao
|
745cb6450c
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-11 15:09:24 +08:00 |
ZhangBiao
|
21e1c0366c
|
【优化】神将情报界面优化
|
2021-11-11 15:08:13 +08:00 |
ZhangBiao
|
c37386fada
|
【优化】轩辕宝境界面优化
|
2021-11-11 14:59:15 +08:00 |
gaoxin
|
3addb9905b
|
【神将觉醒】觉醒成功界面中,不需要显示非核心天赋的变化(非特性天赋),且【特性】文字需要放大
|
2021-11-11 14:10:48 +08:00 |
gaoxin
|
9013148d1e
|
【玉虚论道】界面切边修改
|
2021-11-11 13:40:37 +08:00 |
jiaoyangna
|
278e309174
|
商店新字位置调整
|
2021-11-11 11:43:09 +08:00 |
ZhangBiao
|
3eca9bec47
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-11 10:11:04 +08:00 |
ZhangBiao
|
c104bd65a7
|
【灵脉秘境】提交
|
2021-11-11 10:06:49 +08:00 |
gaoxin
|
20df877296
|
【btview】按钮顺序调整,主城,主角,神将,关卡,副本,背包,公会
|
2021-11-10 16:40:38 +08:00 |
ZhangBiao
|
cc316086e9
|
【新·物品】界面提交
|
2021-11-10 15:03:18 +08:00 |