jiaoyangna
|
d83373ecab
|
Merge branch 'china/dev' into tansuo
# Conflicts:
# Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab
# Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Logic/GameEvent.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/View/JumpViewNew.lua
# Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua
|
2021-12-27 17:00:14 +08:00 |
gaoxin
|
220bfff064
|
【优化】魂印描述优化
|
2021-12-30 00:54:40 +08:00 |
ZhangBiao
|
337261f8b2
|
【家园】升级,取消,加速
|
2021-12-24 18:20:18 +08:00 |
jiaoyangna
|
65dbdc5283
|
【ID1019454】
【魂印】替换魂印时不刷新界面,需要重新进入才能看到替换后的魂印
|
2021-12-24 16:31:25 +08:00 |
ZhangBiao
|
a28021b4f6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-24 14:47:52 +08:00 |
ZhangBiao
|
80b6315905
|
【降妖夺宝】在活动页面,进入珍奇宝阁购买野球拳,足够10连抽时,10连按钮依然显示妖晶抽取
|
2021-12-24 14:47:39 +08:00 |
jiaoyangna
|
b33bd02c7f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-24 14:25:22 +08:00 |
jiaoyangna
|
36ec134505
|
玉帝获取途径跳转提交
|
2021-12-24 14:20:06 +08:00 |
ZhangBiao
|
99d00e88e2
|
【命格】合成界面第一次打开道具详情
|
2021-12-24 14:19:47 +08:00 |
jiaoyangna
|
21e5b0846b
|
玉帝跳转提交
|
2021-12-24 14:13:39 +08:00 |
jiaoyangna
|
88130ac4dd
|
探索提交
|
2021-12-24 14:09:48 +08:00 |
ZhangBiao
|
dbc3395945
|
【家园】详情
|
2021-12-24 09:33:56 +08:00 |
jiaoyangna
|
130a75c8dd
|
探索提交
|
2021-12-24 00:14:32 +08:00 |
ZhangBiao
|
078c3a1f96
|
Merge branch 'china/dev' into 0功能/家园
|
2021-12-23 17:48:20 +08:00 |
jiaoyangna
|
5d37c0d4d9
|
探索提交
|
2021-12-23 17:23:02 +08:00 |
ZhangBiao
|
7f9726e006
|
【命格】提交
|
2021-12-23 16:39:37 +08:00 |
ZhangBiao
|
926e0a4fbd
|
【命石】一键合成修改
|
2021-12-23 16:17:35 +08:00 |
ZhangBiao
|
6fe4e5d3f6
|
Merge branch 'china/dev' into 0功能/家园
|
2021-12-23 14:49:47 +08:00 |
ZhangBiao
|
f676ae8478
|
【家园】提交
|
2021-12-23 14:38:02 +08:00 |
jiaoyangna
|
7bb3325c99
|
探索提交
|
2021-12-23 13:09:34 +08:00 |
ZhangBiao
|
e6aa1d31fe
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab
# Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
|
2021-12-23 09:43:06 +08:00 |
gaoxin
|
39495bee28
|
【至尊降世】修复老活动跳转报错
|
2021-12-21 21:03:42 +08:00 |
ZhangBiao
|
745a9d1dae
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-12-20 14:07:56 +08:00 |
ZhangBiao
|
df483145bf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 17:13:57 +08:00 |
ZhangBiao
|
a9b7c21fad
|
【道具弹窗】跳转按钮错位
|
2021-12-17 17:13:45 +08:00 |
jiaoyangna
|
6b234c7f2f
|
文字重叠修改提交
|
2021-12-17 16:53:26 +08:00 |
jiaoyangna
|
3119f9b277
|
价格描述修改
|
2021-12-17 16:43:24 +08:00 |
jiaoyangna
|
ffd7d0ecbe
|
超值返利修改提交
|
2021-12-17 16:41:08 +08:00 |
ZhangBiao
|
a197f16837
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
|
2021-12-17 15:46:53 +08:00 |
jiaoyangna
|
83b1fad0b7
|
跳转修改提交
|
2021-12-17 14:11:03 +08:00 |
jiaoyangna
|
abb3c4ec5f
|
跳转修改提交
|
2021-12-17 13:30:45 +08:00 |
jiaoyangna
|
ec53e8ad84
|
超值返利提交
|
2021-12-17 11:22:54 +08:00 |
jiaoyangna
|
740aeac6bf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-16 18:43:36 +08:00 |
gaoxin
|
eaea265bc7
|
【物品】添加物品使用的限制等级
|
2021-12-26 17:35:50 +08:00 |
jiaoyangna
|
c1f0e0f78b
|
添加选中框
|
2021-12-16 18:38:32 +08:00 |
jiaoyangna
|
1ae167efb5
|
至尊降世修改提交
|
2021-12-16 16:55:30 +08:00 |
jiaoyangna
|
11c4f914b5
|
至尊降世提交
|
2021-12-16 11:42:00 +08:00 |
jiaoyangna
|
73283bd818
|
回退修改提交
|
2021-12-16 10:09:48 +08:00 |
jiaoyangna
|
c6eb719fa6
|
添加回退消耗数量
|
2021-12-15 14:41:04 +08:00 |
jiaoyangna
|
568ad92a9b
|
回退修改
|
2021-12-15 14:28:36 +08:00 |
gaoxin
|
8d644dd080
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-25 07:58:52 +08:00 |
gaoxin
|
973eee4b30
|
【物品】添加新物品类型
|
2021-12-25 07:58:30 +08:00 |
gaoxin
|
d14c0fe589
|
【ID1010850】首充豪礼100元档去除
|
2021-12-24 17:49:17 +08:00 |
jiaoyangna
|
7e85eeaa90
|
【ID1010843】
增加英雄回退功能
|
2021-12-14 17:57:21 +08:00 |
jiaoyangna
|
0c83c3412e
|
【ID1010843】
增加英雄回退功能
|
2021-12-14 17:25:44 +08:00 |
ZhangBiao
|
f248583e9e
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-14 09:49:12 +08:00 |
ZhangBiao
|
13815dd2a5
|
【命格】提交
|
2021-12-14 09:48:28 +08:00 |
ZhangBiao
|
0b5c84931a
|
【命格】提交
|
2021-12-13 18:25:35 +08:00 |
jiaoyangna
|
b4e7faa04c
|
文字修改
|
2021-12-13 17:44:14 +08:00 |
ZhangBiao
|
1f249735a3
|
【命格】提交
|
2021-12-13 17:38:13 +08:00 |
ZhangBiao
|
0b9bd476dd
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-13 17:26:43 +08:00 |
ZhangBiao
|
d91811a555
|
【命格】提交
|
2021-12-13 17:26:08 +08:00 |
jiaoyangna
|
52ad37eee0
|
【ID1019400】
【月卡】购买招募秘宝后不弹出激活月卡提示,领取招募秘宝奖励时才弹出,并且提示不正确
|
2021-12-13 16:20:48 +08:00 |
jiaoyangna
|
244aa76319
|
【ID1019396】
【招募秘宝】激活秘宝后没有获得980妖晶
|
2021-12-13 15:13:31 +08:00 |
ZhangBiao
|
c11848b98a
|
【命格】红点提交
|
2021-12-10 18:27:43 +08:00 |
ZhangBiao
|
ad589aa449
|
【命格】提交
|
2021-12-10 17:18:18 +08:00 |
ZhangBiao
|
4b4ae7a608
|
【命格】提交
|
2021-12-10 16:16:41 +08:00 |
ZhangBiao
|
1ae26afed2
|
【命格】跳转
|
2021-12-10 15:46:35 +08:00 |
ZhangBiao
|
f09556242d
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
|
2021-12-10 14:16:28 +08:00 |
ZhangBiao
|
82c89e5e7d
|
【命格】提交
|
2021-12-10 13:57:24 +08:00 |
jiaoyangna
|
e33181dddb
|
招募秘宝提交
|
2021-12-10 13:41:03 +08:00 |
ZhangBiao
|
bab62f274c
|
【命格】提交
|
2021-12-10 11:01:44 +08:00 |
ZhangBiao
|
cb5cf43089
|
【命格】提交
|
2021-12-09 20:17:37 +08:00 |
ZhangBiao
|
9875630085
|
【命格】提交
|
2021-12-09 13:29:16 +08:00 |
ZhangBiao
|
ae3a2fa3e4
|
【命格】提交
|
2021-12-08 15:40:43 +08:00 |
ZhangBiao
|
016780c7bc
|
【命格】命石替换
|
2021-12-08 14:17:18 +08:00 |
ZhangBiao
|
1efc9fc56b
|
【命格】命石穿戴
|
2021-12-08 09:29:08 +08:00 |
ZhangBiao
|
1805fe0848
|
【装备】出售单个装备报错修改
|
2021-12-01 10:16:42 +08:00 |
jiaoyangna
|
12fb7447cc
|
坐骑合成修改
|
2021-11-30 13:23:29 +08:00 |
wangzhenxing
|
0cef7683ba
|
[战斗]======效果137修改 立绘朝向修改
|
2021-11-29 17:53:17 +08:00 |
wangzhenxing
|
ea7e7d31be
|
【战中表现】======身外化身表现优化
|
2021-11-29 16:19:43 +08:00 |
jiaoyangna
|
f6c94a3cfe
|
变身卡详情提交
|
2021-11-26 19:36:20 +08:00 |
gaoxin
|
bb685191dd
|
【优化】设置物品显示的方法改为通用方法
|
2021-11-26 14:27:24 +08:00 |
gaoxin
|
3a574880ea
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 10:19:35 +08:00 |
gaoxin
|
ad3ca2e0d2
|
【战斗】新增轩辕宝镜,僧罗幻境战斗类型,四灵试炼回放改为回放类型
|
2021-11-26 10:19:29 +08:00 |
ZhangBiao
|
f83bffaf75
|
【固定活动】提交
|
2021-11-26 10:16:46 +08:00 |
ZhangBiao
|
45df1fb982
|
【寻仙招募】增加心愿阵营条
|
2021-11-26 09:54:12 +08:00 |
ZhangBiao
|
fd97f584cb
|
【固定活动】调整
|
2021-11-25 18:51:36 +08:00 |
ZhangBiao
|
a8f666e901
|
【删除活动类型43】
|
2021-11-25 17:27:02 +08:00 |
ZhangBiao
|
e4b0fd1824
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-24 18:14:37 +08:00 |
ZhangBiao
|
ac768ff163
|
【常驻活动】提交
|
2021-11-24 18:14:25 +08:00 |
gaoxin
|
4607bd2fed
|
Merge branch '0功能/账号id校验' into china/dev
|
2021-11-24 16:03:34 +08:00 |
ZhangBiao
|
18648a7622
|
【云游商人】装备文字叠加、显示人名错误修改
|
2021-11-24 10:18:36 +08:00 |
ZhangBiao
|
fbb58dbfdc
|
【云游商人】不同神将穿戴同一品质装备,弹窗显示的都是一个神将名
|
2021-11-22 18:44:32 +08:00 |
gaoxin
|
95382d530e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 17:37:38 +08:00 |
gaoxin
|
487c0d327a
|
【魂印穿戴】点击穿戴其他神将身上的魂印提示穿戴成功,但不显示,需要来回切换才能刷新并且看到新替换的魂印
|
2021-11-22 17:37:26 +08:00 |
ZhangBiao
|
f4febd8ed8
|
【灵脉秘境】竞技场pvp切磋报错修改
|
2021-11-22 17:20:04 +08:00 |
gaoxin
|
e800f29b33
|
【竞技场】查看玩家信息报错
|
2021-11-22 16:06:52 +08:00 |
ZhangBiao
|
95f71667fe
|
【灵脉秘境】提交
|
2021-11-19 17:23:06 +08:00 |
ZhangBiao
|
5e09e0b9a3
|
【灵脉秘境】切磋
|
2021-11-19 16:16:45 +08:00 |
ZhangBiao
|
c9e465f662
|
【灵脉秘境】提交
|
2021-11-19 11:45:53 +08:00 |
ZhangBiao
|
6454e84172
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-18 19:07:50 +08:00 |
gaoxin
|
cd291429f1
|
【坐骑碎片合成】删除无用代码
|
2021-11-18 16:05:26 +08:00 |
gaoxin
|
77c3376d82
|
【坐骑碎片合成】
|
2021-11-18 16:03:34 +08:00 |
ZhangBiao
|
79d2113bc2
|
【灵脉秘境】提交
|
2021-11-18 14:10:57 +08:00 |
ZhangBiao
|
de7a516a87
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-18 13:30:03 +08:00 |
ZhangBiao
|
03cdea5c83
|
【灵脉秘境】纪录提交
|
2021-11-18 11:35:20 +08:00 |
gaoxin
|
3565dc2b2a
|
【改名时上报事件】
|
2021-11-18 11:34:54 +08:00 |
ZhangBiao
|
790fe1c88f
|
【灵脉秘境】提交
|
2021-11-17 18:28:59 +08:00 |
gaoxin
|
1aa2efc1b1
|
【装备信息】基础属性,属性多关闭打开属性少的,显示属性错误
|
2021-11-17 16:58:06 +08:00 |