ZhangBiao
|
5e0c53e322
|
【家园】替换底图
|
2022-01-04 18:58:34 +08:00 |
jiaoyangna
|
1774e3d8bd
|
累计收益图片提交
(cherry picked from commit d33b2dad3b)
|
2022-01-04 16:29:02 +08:00 |
jiaoyangna
|
d33b2dad3b
|
累计收益图片提交
|
2022-01-04 16:28:03 +08:00 |
ZhangBiao
|
2b3afae7ea
|
【家园】特权
|
2021-12-31 18:13:10 +08:00 |
ZhangBiao
|
27ead6dcff
|
【家园】提交
|
2021-12-31 16:30:53 +08:00 |
wangzhenxing
|
adae4e2134
|
[飞升]======飞升图片资源提交
|
2021-12-31 13:44:27 +08:00 |
ZhangBiao
|
bd2d5ccd50
|
【家园】提交
|
2021-12-30 20:24:59 +08:00 |
ZhangBiao
|
8de1e4e596
|
【家园】资源提交
|
2021-12-30 19:02:52 +08:00 |
skuld
|
40d00536ea
|
bat Resource Commit:2022/01/03, 0:51:54
|
2022-01-03 00:51:55 +08:00 |
jiaoyangna
|
7b67ef38df
|
Merge branch 'china/dev' into tansuo
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-12-30 11:43:22 +08:00 |
jiaoyangna
|
2a14bc799f
|
探索中优化
|
2021-12-30 11:41:13 +08:00 |
ZhangBiao
|
44aa663ab0
|
Merge branch 'china/dev' into 0功能/家园
|
2021-12-30 11:24:38 +08:00 |
jiaoyangna
|
89c298f593
|
探索地图修改提交
|
2021-12-29 16:05:16 +08:00 |
wangzhenxing
|
beb2acd3af
|
【战斗】=========buff图标大小修改提交
|
2021-12-29 15:20:11 +08:00 |
jiaoyangna
|
dac88a6dbf
|
探索提交
|
2021-12-29 10:02:22 +08:00 |
jiaoyangna
|
29a3faa8c0
|
切图提交
|
2021-12-28 15:36:04 +08:00 |
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 |
jiaoyangna
|
b9a86b402c
|
探索提交
|
2021-12-27 14:53:55 +08:00 |
gaoxin
|
8f0567d801
|
【挂机】新人商城按钮资源修改
|
2021-12-30 03:05:32 +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 |
skuld
|
bd746b40b0
|
bat Resource Commit:2021/12/23,17:27:24
|
2021-12-23 17:27:25 +08:00 |
jiaoyangna
|
5d37c0d4d9
|
探索提交
|
2021-12-23 17:23:02 +08:00 |
gaoxin
|
da2b205955
|
【挂机】添加新人商城入口
|
2021-12-30 00:01:14 +08:00 |
ZhangBiao
|
6fe4e5d3f6
|
Merge branch 'china/dev' into 0功能/家园
|
2021-12-23 14:49:47 +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 |
jiaoyangna
|
d2271d89b6
|
探索提交
|
2021-12-22 12:07:00 +08:00 |
ZhangBiao
|
e111740975
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-12-21 18:13:13 +08:00 |
jiaoyangna
|
89fdc69afd
|
添加拍脸提交
|
2021-12-21 17:21:10 +08:00 |
skuld
|
867f90eecd
|
bat Resource Commit:2021/12/22, 0:37:08
|
2021-12-22 00:37:09 +08:00 |
skuld
|
e84f78fe3f
|
bat Resource Commit:2021/12/22, 0:35:40
|
2021-12-22 00:35:40 +08:00 |
ZhangBiao
|
8eb6abec8e
|
【家园】开坑
|
2021-12-20 16:50:51 +08:00 |
wangzhenxing
|
885a6e2fa8
|
[功能]========结算记录界面添加阵亡标签
|
2021-12-20 15:32:28 +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
|
38966d1b16
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-17 18:35:40 +08:00 |
ZhangBiao
|
72b0f31d50
|
【特惠商城】提交
|
2021-12-17 18:25:45 +08:00 |
luyao
|
44eb9decb8
|
【至尊降世】豪华月卡图标
|
2021-12-17 18:11:25 +08:00 |
gaoxin
|
ce0c1db2f3
|
【关卡】解锁提示资源提交
|
2021-12-27 16:55:17 +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
|
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 |
jiaoyangna
|
c1f0e0f78b
|
添加选中框
|
2021-12-16 18:38:32 +08:00 |
ZhangBiao
|
b203711459
|
Merge branch 'china/dev' into 0优化/商城界面
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-12-16 17:17:16 +08:00 |
jiaoyangna
|
11c4f914b5
|
至尊降世提交
|
2021-12-16 11:42:00 +08:00 |
jiaoyangna
|
0c83c3412e
|
【ID1010843】
增加英雄回退功能
|
2021-12-14 17:25:44 +08:00 |
ZhangBiao
|
31ce94705d
|
【商城界面】资源提交
|
2021-12-14 13:15:20 +08:00 |
skuld
|
07b7374288
|
bat Resource Commit:2021/12/13,17:25:54
|
2021-12-13 17:25:55 +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
|
8d90ab771a
|
资源提交
|
2021-12-13 17:04:39 +08:00 |
jiaoyangna
|
9bb48dab19
|
招募基金修改
|
2021-12-13 16:53:29 +08:00 |
wangzhenxing
|
f2738790f5
|
[战斗]=======抗暴率 加减 仙音环绕 buff图标颜色修改
|
2021-12-13 16:00:42 +08:00 |
wangzhenxing
|
58d08c65cc
|
【战斗】=======战斗buff图标资源提交
|
2021-12-13 14:31:06 +08:00 |
jiaoyangna
|
28584ad6f2
|
竞技试炼资源提交
|
2021-12-13 14:17:38 +08:00 |
ZhangBiao
|
82c89e5e7d
|
【命格】提交
|
2021-12-10 13:57:24 +08:00 |
ZhangBiao
|
a0675baeb8
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-07 16:28:44 +08:00 |
wangzhenxing
|
35e42ed5f0
|
【战斗】===buff图标资源 回合变化延时修改
|
2021-12-07 13:18:52 +08:00 |
ZhangBiao
|
3b53332e7b
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-12-06 18:26:14 +08:00 |
wangzhenxing
|
983864f46c
|
【战斗】=====抗暴率 提交字提交
|
2021-12-06 17:13:47 +08:00 |
ZhangBiao
|
10ad308033
|
【命格】提交
|
2021-12-06 15:07:34 +08:00 |
ZhangBiao
|
c8f664b93d
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-06 14:24:56 +08:00 |
ZhangBiao
|
23be95a314
|
【命格】提交
|
2021-12-06 14:24:24 +08:00 |
luyao
|
a9ecbeaddd
|
方寸商店meta文件。及 牛魔王【气冲斗牛】技能字
|
2021-12-06 13:40:25 +08:00 |
luyao
|
c4555d808f
|
【方寸商店】文字上传
|
2021-12-06 13:33:55 +08:00 |
wangzhenxing
|
402546b8ef
|
【战斗】=====buff图标提示文字资源提交
|
2021-12-03 18:34:40 +08:00 |
jiaoyangna
|
660bbdf997
|
方寸寻宝修改提交
|
2021-12-03 18:03:36 +08:00 |
ZhangBiao
|
f431eea90c
|
【连购礼包】提交
|
2021-12-02 14:03:38 +08:00 |
jiaoyangna
|
ff48e4c11f
|
天地烘炉修改提交
|
2021-11-29 16:35:23 +08:00 |
skuld
|
42923df528
|
bat Resource Commit:2021/12/08,15:42:15
|
2021-12-08 15:42:16 +08:00 |
gaoxin
|
0d1c025624
|
【活动】连续礼包,添加
|
2021-12-02 01:44:29 +08:00 |
luyao
|
352de7108e
|
【神将头像朝向修改左>右】
|
2021-11-27 16:45:05 +08:00 |
jiaoyangna
|
767d4589c7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-27 13:54:56 +08:00 |
skuld
|
e520475181
|
bat Resource Commit:2021/12/03,13:38:14
|
2021-12-03 13:38:14 +08:00 |
jiaoyangna
|
04987414e9
|
图片修改提交
|
2021-11-27 13:54:36 +08:00 |
ZhangBiao
|
7e1039bf3b
|
【灵脉秘境】特效
|
2021-11-26 15:43:39 +08:00 |
ZhangBiao
|
5c7ba2529d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 15:15:23 +08:00 |
ZhangBiao
|
b33ee1b006
|
【灵脉秘境】特效提交
|
2021-11-26 15:15:10 +08:00 |
jiaoyangna
|
b6bcd50dd3
|
身外化身修改提交
|
2021-11-26 14:11:23 +08:00 |
jiaoyangna
|
2212df06ce
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 11:39:24 +08:00 |
jiaoyangna
|
1e17151d7f
|
Merge branch 'china/dev' into 0功能/Incarnation
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-11-26 11:35:57 +08:00 |
jiaoyangna
|
c0c8a6710c
|
身外化身提交
|
2021-11-26 11:08:48 +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
|
fd97f584cb
|
【固定活动】调整
|
2021-11-25 18:51:36 +08:00 |
ZhangBiao
|
8da0a81588
|
【寻仙抽】提交
|
2021-11-25 15:59:31 +08:00 |
gaoxin
|
347cc3f9ba
|
【每日豪礼】资源68->98
|
2021-11-25 10:47:02 +08:00 |
jiaoyangna
|
e61de063cf
|
法宝聚灵修改提交
|
2021-11-22 11:01:43 +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
|
85c8028bc5
|
Merge branch 'china/dev' into 0功能/灵脉秘境
|
2021-11-19 17:57:09 +08:00 |
jiaoyangna
|
de31ad6dfe
|
资源替换
|
2021-11-19 17:41:40 +08:00 |
ZhangBiao
|
9f356783e1
|
【灵脉秘境】提交
|
2021-11-19 17:01:10 +08:00 |
jiaoyangna
|
bc62311af9
|
法宝之魂第二个界面提交
|
2021-11-19 16:52:15 +08:00 |
skuld
|
2bd271390d
|
bat Resource Commit:2021/12/02, 9:45:19
|
2021-12-02 09:45:20 +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 |
jiaoyangna
|
9e99347a2b
|
法宝聚灵提交
|
2021-11-19 11:37:26 +08:00 |
jiaoyangna
|
808dcddc62
|
法宝聚灵界面1提交
|
2021-11-19 11:33:34 +08:00 |
wangzhenxing
|
1a623036fa
|
[战斗]============禁甲图片提交
|
2021-11-19 11:30:42 +08:00 |